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)
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>
1  2 
arch/powerpc/kernel/process.c
arch/powerpc/platforms/pseries/smp.c
include/asm-powerpc/system.h
include/asm-ppc/system.h

Simple merge
Simple merge
Simple merge
Simple merge