Merge v2.6.37-rc8 into powerpc/next

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

diff --cc arch/powerpc/sysdev/mpc8xxx_gpio.c
index 36499394a1618dd55f673aa4d4bf82bcd1296ae1,c0ea05e87f1db143dfe4439c69eb14f08fed03d0..c48cd81780796da657294cfa484b6e323b91971b
--- 1/arch/powerpc/sysdev/mpc8xxx_gpio.c
--- 2/arch/powerpc/sysdev/mpc8xxx_gpio.c
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@@ -386,9 -321,18 +386,12 @@@ static int __init mpc8xxx_add_gpiochips
  {
        struct device_node *np;
  
 -      for_each_compatible_node(np, NULL, "fsl,mpc8349-gpio")
 -              mpc8xxx_add_controller(np);
 -
 -      for_each_compatible_node(np, NULL, "fsl,mpc8572-gpio")
 -              mpc8xxx_add_controller(np);
 -
 -      for_each_compatible_node(np, NULL, "fsl,mpc8610-gpio")
 +      for_each_matching_node(np, mpc8xxx_gpio_ids)
                mpc8xxx_add_controller(np);
  
+       for_each_compatible_node(np, NULL, "fsl,qoriq-gpio")
+               mpc8xxx_add_controller(np);
+ 
        return 0;
  }
  arch_initcall(mpc8xxx_add_gpiochips);