From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Jul 2008 16:15:23 +0000 (-0700)
Subject: Merge branch 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... 
X-Git-Tag: v2.6.27-rc1~1041
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fea1f385e99a1db979eb75c8a53c0baad0d9f6;p=linux-2.6

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
---

42fea1f385e99a1db979eb75c8a53c0baad0d9f6