Merge commit 'gcl/gcl-next'

diff --cc Documentation/powerpc/booting-without-of.txt
Simple merge

diff --cc arch/powerpc/platforms/52xx/Kconfig
index d664b1b,c1ca4f3..9a51675
--- 1/arch/powerpc/platforms/52xx/Kconfig
--- 2/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@@ -1,9 -1,7 +1,8 @@@
  config PPC_MPC52xx
        bool "52xx-based boards"
        depends on PPC_MULTIPLATFORM && PPC32
-       select FSL_SOC
        select PPC_CLOCK
 +      select PPC_PCI_CHOICE
  
  config PPC_MPC5200_SIMPLE
        bool "Generic support for simple MPC5200 based boards"