diff options
author | James Morris <james.l.morris@oracle.com> | 2015-10-21 01:49:29 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-10-21 01:49:29 +0200 |
commit | 09302fd19efbff9569eaad3f78ead8f411defd87 (patch) | |
tree | ea7445250c19d8af6092eecb6908f1547dde86d6 /security/apparmor | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li... (diff) | |
parent | Smack: limited capability for changing process label (diff) | |
download | linux-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