powerpc: apply recent changes to merged code
authorPaul Mackerras <paulus@samba.org>
Mon, 31 Oct 2005 02:57:01 +0000 (13:57 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 31 Oct 2005 02:57:01 +0000 (13:57 +1100)
commit734d6524800b6a8362666e893a5f3f29b9ef0be9
tree507fe9acc6fccce31369842d89d86d8dd432dc37
parent23fd07750a789a66fe88cf173d52a18f1a387da4
powerpc: apply recent changes to merged code

Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/of_device.c
arch/powerpc/kernel/ptrace.c
arch/powerpc/kernel/ptrace32.c
arch/powerpc/kernel/time.c
arch/powerpc/lib/locks.c
arch/powerpc/mm/imalloc.c