commit | 42fea1f385e99a1db979eb75c8a53c0baad0d9f6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 17 09:15:23 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 17 09:15:23 2008 -0700 |
tree | abac6ecf700b671cd970ef3dd21d9201e79f7090 | |
parent | 7259d936c6af216198ae6af3a25ac6c9dbdbe779 [diff] | |
parent | 666f164f4fbfa78bd00fb4b74788b42a39842c64 [diff] |
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