Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c

1  2 
arch/powerpc/boot/Makefile
arch/powerpc/boot/wrapper
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/40x/ppc40x_simple.c

Simple merge
Simple merge
Simple merge
index ecac237827ef8622980d21d81efee6f5168b1b6d,2f8fde6521eab1318c61347f4b35e527274b06f8..97612068fae303cac93604ed01c7d5353ca86b61
@@@ -55,8 -55,8 +55,9 @@@ static const char *board[] __initdata 
        "amcc,haleakala",
        "amcc,kilauea",
        "amcc,makalu",
 -      "est,hotfoot"
+       "apm,klondike",
 +      "est,hotfoot",
 +      "plathome,obs600"
  };
  
  static int __init ppc40x_probe(void)