tree abac6ecf700b671cd970ef3dd21d9201e79f7090
parent 7259d936c6af216198ae6af3a25ac6c9dbdbe779
parent 666f164f4fbfa78bd00fb4b74788b42a39842c64
author Linus Torvalds <torvalds@linux-foundation.org> 1216311323 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216311323 -0700

Merge branch 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace

* 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:
  fix dangling zombie when new parent ignores children
  do_wait: return security_task_wait() error code in place of -ECHILD
  ptrace children revamp
  do_wait reorganization