summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 17:24:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 17:24:41 +0200
commita31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (patch)
treefe8766f145384c86f37d639236741774ca53fc0d /net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff)
parentselinux: Fix send_sigiotask hook (diff)
downloadlinux-a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69.tar.xz
linux-a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions