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

arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c


Trivial merge