Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into...
Oleg Nesterov [Thu, 7 Apr 2011 18:44:11 +0000 (20:44 +0200)]
1  2 
include/linux/sched.h
kernel/exit.c
kernel/ptrace.c
kernel/signal.c

Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/ptrace.c
Simple merge
diff --cc kernel/signal.c
Simple merge