From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 16 Dec 2011 00:24:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'jwb/next' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e7342e7789fa2ca9202701467428726cbcfd649;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branch 'jwb/next' into next

Conflicts:
	arch/powerpc/platforms/40x/ppc40x_simple.c
---

1e7342e7789fa2ca9202701467428726cbcfd649
diff --cc arch/powerpc/platforms/40x/ppc40x_simple.c
index ecac237827ef,2f8fde6521ea..97612068fae3
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@@ -55,8 -55,8 +55,9 @@@ static const char *board[] __initdata 
  	"amcc,haleakala",
  	"amcc,kilauea",
  	"amcc,makalu",
+ 	"apm,klondike",
 -	"est,hotfoot"
 +	"est,hotfoot",
 +	"plathome,obs600"
  };
  
  static int __init ppc40x_probe(void)