diff options
author | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /security/apparmor | |
parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions