Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
commit43d2548bb2ef7e6d753f91468a746784041e522d
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 05:44:51 +0000 (15 15:44 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 05:44:51 +0000 (15 15:44 +1000)
tree77d13fcd48fd998393abb825ec36e2b732684a73
parent585583d95c5660973bc0cf64add517b040acd8a4
parent85082fd7cbe3173198aac0eb5e85ab1edcc6352c
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

arch/powerpc/Kconfig
18 files changed:
MAINTAINERS
Makefile
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/vmlinux.lds.S
drivers/char/Makefile
drivers/char/viotape.c
drivers/macintosh/adb.c
drivers/macintosh/smu.c
drivers/net/Kconfig
drivers/pcmcia/m8xx_pcmcia.c
include/linux/mm.h
mm/mprotect.c