04bf25e
parent 9f5974c8734d83d4ab7096ed98136a82f41210d6
parent 624cee31bcb14bfd85559fbec5dd7bb833542965
author Linus Torvalds <torvalds@g5.osdl.org> 1137090082 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1137090082 -0800

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>
y