Merge branch 'linux-2.6'

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

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

diff --cc arch/powerpc/platforms/powermac/pfunc_base.c
Simple merge

diff --cc drivers/macintosh/via-pmu.c
Simple merge

diff --cc drivers/video/riva/fbdev.c
Simple merge

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