Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commita31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:24:41 +0000 (5 08:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:24:41 +0000 (5 08:24 -0700)
treefe8766f145384c86f37d639236741774ca53fc0d
parent0488713c1eeff06e497e2e54ffb2795b447e8983
parent65c90bca0dba56f60dc4ce2a529140c3cc440f22
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix send_sigiotask hook