Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/smp.c
Simple merge

diff --cc include/asm-powerpc/system.h
Simple merge

diff --cc include/asm-ppc/system.h
Simple merge