]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ptrace/ptrace'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 04:47:22 +0000 (15:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 04:47:22 +0000 (15:47 +1100)
commit9fd4cd016a913fa5659abce920a69e0e436cd19f
tree6f675198e2155b96a03d59ec93942840c3794556
parentcf8d2e4cea071eedb0d5f122e1c5e7d18dcb2695
parent2efd0a8f5a5e981022faaec780ee00c05eeee8aa
Merge remote-tracking branch 'ptrace/ptrace'

Conflicts:
arch/sparc/kernel/signal32.c
arch/sparc/kernel/signal_32.c
arch/sparc/kernel/signal_64.c
arch/mips/kernel/signal.c
arch/openrisc/kernel/signal.c
arch/s390/kernel/compat_signal.c
arch/s390/kernel/signal.c
arch/sparc/kernel/signal32.c
arch/sparc/kernel/signal_32.c
arch/sparc/kernel/signal_64.c
include/linux/sched.h