diff options
author | James Morris <james.l.morris@oracle.com> | 2013-10-30 04:07:10 +0100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2013-10-30 04:07:10 +0100 |
commit | 50b719f811583a47762ecb7e480d253abc2eb22f (patch) | |
tree | 290e6cb4f15695140a9dbef1164e69ac9c80e454 /security/apparmor | |
parent | ima: provide hash algo info in the xattr (diff) | |
parent | Smack: Ptrace access check mode (diff) | |
download | linux-50b719f811583a47762ecb7e480d253abc2eb22f.tar.xz linux-50b719f811583a47762ecb7e480d253abc2eb22f.zip |
Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions