Merge branch 'linux-2.6' into for-2.6.24

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

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

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

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

diff --cc arch/powerpc/sysdev/cpm2_common.c
Simple merge