Merge commit 'kumar/next' into next

diff --combined arch/powerpc/platforms/86xx/Kconfig
index 3492784,611d0d1..fdaf4dd
--- 1/arch/powerpc/platforms/86xx/Kconfig
--- 2/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@@ -1,7 -1,7 +1,7 @@@
  config PPC_86xx
  menuconfig PPC_86xx
        bool "86xx-based boards"
 -      depends on 6xx && PPC_MULTIPLATFORM
 +      depends on 6xx
        select FSL_SOC
        select ALTIVEC
        help
@@@ -31,6 -31,14 +31,14 @@@ config MPC8610_HPC
        help
          This option enables support for the MPC8610 HPCD board.
  
+ config GEF_PPC9A
+       bool "GE Fanuc PPC9A"
+       select DEFAULT_UIMAGE
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
+       help
+         This option enables support for GE Fanuc's PPC9A.
+ 
  config GEF_SBC310
        bool "GE Fanuc SBC310"
        select DEFAULT_UIMAGE
@@@ -56,7 -64,7 +64,7 @@@ config MPC864
        select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC
-       default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 || GEF_SBC310
+       default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
  
  config MPC8610
        bool