summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2015-10-21 01:49:29 +0200
committerJames Morris <james.l.morris@oracle.com>2015-10-21 01:49:29 +0200
commit09302fd19efbff9569eaad3f78ead8f411defd87 (patch)
treeea7445250c19d8af6092eecb6908f1547dde86d6 /security/apparmor
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li... (diff)
parentSmack: limited capability for changing process label (diff)
downloadlinux-09302fd19efbff9569eaad3f78ead8f411defd87.tar.xz
linux-09302fd19efbff9569eaad3f78ead8f411defd87.zip
Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions