summaryrefslogtreecommitdiff
path: root/security/apparmor
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2013-08-23 02:50:12 +1000
committerJames Morris <james.l.morris@oracle.com>2013-08-23 02:50:12 +1000
commit73203361468894c3c017bfbdd9ddcbb468039604 (patch)
treebfda3843b96c0056ef84d0957110833bb21f2b02 /security/apparmor
parentf8eb8a1324e81927b2c64823b2fc38386efd3fef (diff)
parent10289b0f738e8b301969f2288c4942455f1b1e59 (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