Merge branch 'linux-2.6'
Paul Mackerras [Wed, 13 Sep 2006 21:07:18 +0000 (07:07 +1000)]
1  2 
arch/powerpc/Kconfig
arch/powerpc/configs/maple_defconfig
arch/powerpc/kernel/Makefile
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
arch/powerpc/platforms/powermac/pfunc_base.c
drivers/macintosh/via-pmu.c
drivers/video/riva/fbdev.c
include/asm-powerpc/paca.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge