Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Aug 2008 01:14:24 +0000 (18:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Aug 2008 01:14:24 +0000 (18:14 -0700)
* 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:
  tracehook: fix CLONE_PTRACE


Trivial merge