Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 13 Sep 2006 21:07:18 +0000 (07:07 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 13 Sep 2006 21:07:18 +0000 (07:07 +1000)
commitc547fc28ab3e8716076fdaf4bd0260c5d63a18f7
tree34af1fa64a63618660187ae58ad182665a1861ef
parent3dd836a56de0d4f049438412959b905e1db4666e
parent63b98080daa35f0d682db04f4fb7ada010888752
Merge branch 'linux-2.6'
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