powerpc: apply recent changes to merged code
Signed-off-by:
Paul Mackerras <paulus@samba.org>
Showing
- arch/powerpc/kernel/of_device.c 2 additions, 0 deletionsarch/powerpc/kernel/of_device.c
- arch/powerpc/kernel/ptrace.c 1 addition, 1 deletionarch/powerpc/kernel/ptrace.c
- arch/powerpc/kernel/ptrace32.c 2 additions, 2 deletionsarch/powerpc/kernel/ptrace32.c
- arch/powerpc/kernel/time.c 0 additions, 4 deletionsarch/powerpc/kernel/time.c
- arch/powerpc/lib/locks.c 1 addition, 0 deletionsarch/powerpc/lib/locks.c
- arch/powerpc/mm/imalloc.c 0 additions, 5 deletionsarch/powerpc/mm/imalloc.c
Loading
Please register or sign in to comment