diff options
author | James Morris <jmorris@namei.org> | 2011-06-15 01:41:48 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-06-15 01:41:48 +0200 |
commit | 82b88bb24e28dd4fb4bec30e75412f41326130f0 (patch) | |
tree | 61b1d0eb6ae6059e879571517a0f36bcffdabf34 /security/apparmor | |
parent | x86 idle: APM requires pm_idle/default_idle unconditionally when a module (diff) | |
parent | SELinux: skip file_name_trans_write() when policy downgraded. (diff) | |
download | linux-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