err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 43d2548 fafa3a3)

author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 16 Jul 2008 01:07:59 +0000 (11:07 +1000)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 16 Jul 2008 01:07:59 +0000 (11:07 +1000)
commit	84c3d4aaec3338201b449034beac41635866bddf
tree	3412951682fb2dd4feb8a5532f8efbaf8b345933	tree \| snapshot
parent	43d2548bb2ef7e6d753f91468a746784041e522d	commit \| diff
parent	fafa3a3f16723997f039a0193997464d66dafd8f	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/machine_kexec_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/rtas.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/stacktrace.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/slice.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/mpic.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-mpc.c	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/smp.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree