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)
commitaeee90dfa01844168cd7f8051d0a0f969c573067
treef7a62a16a1484321ce5b4306d5e5f7fa8819243c
parent273b2578392bbf6e5c47a8a3d1ee461ce6fc7182
parent5861bbfcc10fc0358abf52c7d22850c8d180f0b0
Merge branch 'tracehook' of git://git./linux/kernel/git/frob/linux-2.6-utrace

* 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:
  tracehook: fix CLONE_PTRACE