Merge commit 'kumar/kumar-merge' into merge

diff --cc arch/powerpc/configs/83xx/asp8347_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc832x_mds_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc834x_itx_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc834x_mds_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc836x_mds_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc837x_mds_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
Simple merge

diff --cc arch/powerpc/configs/83xx/sbc834x_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/mpc8536_ds_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/mpc8544_ds_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/mpc8568mds_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/mpc8572_ds_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/stx_gp3_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/tqm8540_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/tqm8541_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/tqm8548_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/tqm8555_defconfig
Simple merge

diff --cc arch/powerpc/configs/85xx/tqm8560_defconfig
Simple merge

diff --cc arch/powerpc/configs/86xx/gef_sbc610_defconfig
Simple merge

diff --cc arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
Simple merge

diff --cc arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
Simple merge

diff --cc arch/powerpc/configs/86xx/sbc8641d_defconfig
Simple merge

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

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

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

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

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

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

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