Merge branch 'linux-2.6'

diff --cc arch/powerpc/boot/Makefile
Simple merge

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

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

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

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

diff --cc arch/powerpc/kernel/head_44x.S
Simple merge

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

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

diff --cc arch/powerpc/xmon/xmon.c
Simple merge

diff --cc include/asm-powerpc/system.h
Simple merge