Merge commit 'origin/master'
commit84c3d4aaec3338201b449034beac41635866bddf
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 16 Jul 2008 01:07:59 +0000 (16 11:07 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 16 Jul 2008 01:07:59 +0000 (16 11:07 +1000)
tree3412951682fb2dd4feb8a5532f8efbaf8b345933
parent43d2548bb2ef7e6d753f91468a746784041e522d
parentfafa3a3f16723997f039a0193997464d66dafd8f
Merge commit 'origin/master'

Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
13 files changed:
MAINTAINERS
Makefile
arch/powerpc/Kconfig
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/smp.c
arch/powerpc/kernel/stacktrace.c
arch/powerpc/kernel/time.c
arch/powerpc/mm/slice.c
arch/powerpc/mm/tlb_64.c
arch/powerpc/sysdev/mpic.c
drivers/i2c/busses/i2c-mpc.c
include/asm-powerpc/smp.h