summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-06-15 01:41:48 +0200
committerJames Morris <jmorris@namei.org>2011-06-15 01:41:48 +0200
commit82b88bb24e28dd4fb4bec30e75412f41326130f0 (patch)
tree61b1d0eb6ae6059e879571517a0f36bcffdabf34 /security/apparmor
parentx86 idle: APM requires pm_idle/default_idle unconditionally when a module (diff)
parentSELinux: skip file_name_trans_write() when policy downgraded. (diff)
downloadlinux-82b88bb24e28dd4fb4bec30e75412f41326130f0.tar.xz
linux-82b88bb24e28dd4fb4bec30e75412f41326130f0.zip
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions