Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:21:22 +0000 (10:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:21:22 +0000 (10:21 -0800)
commit45bfe98bd790b5ded00462cd582effcfb42263cc
treed4a1f2c5303dda106635b615f8f40ea9104bf25e
parent9f5974c8734d83d4ab7096ed98136a82f41210d6
parent624cee31bcb14bfd85559fbec5dd7bb833542965
Merge git://git./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>
arch/powerpc/kernel/process.c
arch/powerpc/platforms/pseries/smp.c
include/asm-powerpc/system.h
include/asm-ppc/system.h