summaryrefslogtreecommitdiff
path: root/firmware/myricom
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 14:26:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 14:26:19 -0700
commit683c5e853ebe2d1ac72128f1828421de7fc3a23c (patch)
tree5efaa76d16915feea9241966a90ab93fa4d71397 /firmware/myricom
parentf0f3680e50352c57b6cfc5b0d44d63bb0aa20f80 (diff)
parent0421ea91ddc7895a5a68d3bc670ed4b8e6448a42 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull an Apparmor bugfix from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: apparmor: Fix change_onexec when called from a confined task
Diffstat (limited to 'firmware/myricom')
0 files changed, 0 insertions, 0 deletions