tree 3412951682fb2dd4feb8a5532f8efbaf8b345933
parent 43d2548bb2ef7e6d753f91468a746784041e522d
parent fafa3a3f16723997f039a0193997464d66dafd8f
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216170479 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216170479 +1000

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