Merge branch 'linux-2.6' into for-2.6.24

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/boot/dts/mpc8349emitx.dts
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/file.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/xics.c
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge