diff options
author | James Morris <james.l.morris@oracle.com> | 2013-08-23 02:50:12 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2013-08-23 02:50:12 +1000 |
commit | 73203361468894c3c017bfbdd9ddcbb468039604 (patch) | |
tree | bfda3843b96c0056ef84d0957110833bb21f2b02 /security/apparmor | |
parent | f8eb8a1324e81927b2c64823b2fc38386efd3fef (diff) | |
parent | 10289b0f738e8b301969f2288c4942455f1b1e59 (diff) |
Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions