summaryrefslogtreecommitdiffstats
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-03-08 01:38:10 +0100
committerJames Morris <jmorris@namei.org>2011-03-08 01:38:10 +0100
commitfe3fa43039d47ee4e22caf460b79b62a14937f79 (patch)
tree9eab8d00f1227b9fe0959f32a62d892ed35803ba /security/apparmor/apparmorfs.c
parentKEYS: Add an iovec version of KEYCTL_INSTANTIATE (diff)
parentSELinux: implement the new sb_remount LSM hook (diff)
downloadlinux-fe3fa43039d47ee4e22caf460b79b62a14937f79.tar.xz
linux-fe3fa43039d47ee4e22caf460b79b62a14937f79.zip
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Diffstat (limited to 'security/apparmor/apparmorfs.c')
0 files changed, 0 insertions, 0 deletions