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

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

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/powerpc/boot/wrapper
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/ppc40x_simple.c
index ecac237827ef8622980d21d81efee6f5168b1b6d,2f8fde6521eab1318c61347f4b35e527274b06f8..97612068fae303cac93604ed01c7d5353ca86b61
--- 1/arch/powerpc/platforms/40x/ppc40x_simple.c
--- 2/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",
 -      "est,hotfoot"
+       "apm,klondike",
 +      "est,hotfoot",
 +      "plathome,obs600"
  };
  
  static int __init ppc40x_probe(void)