Merge remote-tracking branch 'galak/next'

diff --cc arch/powerpc/configs/corenet64_smp_defconfig
Simple merge

diff --cc arch/powerpc/configs/mpc85xx_defconfig
Simple merge

diff --cc arch/powerpc/configs/mpc85xx_smp_defconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_mds.c
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_rdb.c
Simple merge

diff --cc arch/powerpc/platforms/86xx/mpc8610_hpcd.c
Simple merge