diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 10:14:30 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 10:14:30 +0100 |
commit | e36d5058dbf85aacf2fadf508f275afd37c58576 (patch) | |
tree | 35f2525f2666b272028ed0e956d43d547581eeb6 /ipc/mq_sysctl.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
parent | Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-e36d5058dbf85aacf2fadf508f275afd37c58576.tar.xz linux-e36d5058dbf85aacf2fadf508f275afd37c58576.zip |
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
encrypted-keys: module build fixes
encrypted-keys: fix error return code
Smack: smackfs cipso seq read repair
Diffstat (limited to 'ipc/mq_sysctl.c')
0 files changed, 0 insertions, 0 deletions