diff options
author | James Morris <james.l.morris@oracle.com> | 2016-07-09 05:49:00 +0300 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2016-07-09 05:49:00 +0300 |
commit | e1e5fa961612d774c122fc79f93a50a9dc8db321 (patch) | |
tree | 0bbb655a3bbdc70e7f1aeb6d10b6a9bf8f8dd2d2 /security/apparmor/policy.c | |
parent | c632809953fbde9e74394eae2de9d1f5e60ac427 (diff) | |
parent | 9552c7aebb8c36912612fddad5b55267c671a303 (diff) | |
download | linux-e1e5fa961612d774c122fc79f93a50a9dc8db321.tar.xz |
Merge tag 'keys-misc-20160708' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/apparmor/policy.c')
0 files changed, 0 insertions, 0 deletions