Merge remote-tracking branch 'ptrace/ptrace'

Conflicts:
	arch/sparc/kernel/signal32.c
	arch/sparc/kernel/signal_32.c
	arch/sparc/kernel/signal_64.c

diff --cc arch/mips/kernel/signal.c
Simple merge

diff --cc arch/openrisc/kernel/signal.c
Simple merge

diff --cc arch/s390/kernel/compat_signal.c
Simple merge

diff --cc arch/s390/kernel/signal.c
Simple merge

diff --cc arch/sparc/kernel/signal32.c
Simple merge

diff --cc arch/sparc/kernel/signal_32.c
Simple merge

diff --cc arch/sparc/kernel/signal_64.c
Simple merge

diff --cc include/linux/sched.h
Simple merge