Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Aug 2008 15:43:47 +0000 (08:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Aug 2008 15:43:47 +0000 (08:43 -0700)
commit75d95062185c60356a423f7ab9e975b4293ec4f3
tree3840402016a9176ea03988adb4c9209e1aaa09ba
parentc5b0079c0a7641caac3fedab75e8e63aeb54d7e2
parent1b04624f93bb1c4f9495b8476d1dd0200af019e2
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 SA_NOCLDWAIT