summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2013-08-22 18:50:12 +0200
committerJames Morris <james.l.morris@oracle.com>2013-08-22 18:50:12 +0200
commit73203361468894c3c017bfbdd9ddcbb468039604 (patch)
treebfda3843b96c0056ef84d0957110833bb21f2b02 /security/apparmor
parentapparmor: add the ability to report a sha1 hash of loaded policy (diff)
parentSmack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytes (diff)
downloadlinux-73203361468894c3c017bfbdd9ddcbb468039604.tar.xz
linux-73203361468894c3c017bfbdd9ddcbb468039604.zip
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