err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 12 Jan 2006 18:21:22 +0000 (10:21 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 12 Jan 2006 18:21:22 +0000 (10:21 -0800)
commit	45bfe98bd790b5ded00462cd582effcfb42263cc
tree	d4a1f2c5303dda106635b615f8f40ea9104bf25e	tree \| snapshot
parent	9f5974c8734d83d4ab7096ed98136a82f41210d6	commit \| diff
parent	624cee31bcb14bfd85559fbec5dd7bb833542965	commit \| diff

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>

Linux 2.6 source tree

RSS Atom

arch/powerpc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/smp.c	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/system.h	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/system.h	diff1 \|	diff2 \|	blob \| history