diff options
author | James Morris <james.l.morris@oracle.com> | 2015-10-22 11:17:50 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-10-22 11:17:50 +1100 |
commit | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (patch) | |
tree | 0b9233d8daac506b094307683fe27edba0a1f00d /security/keys | |
parent | 083c1290ca73666ce1b551cc89d080d060f02ad6 (diff) | |
parent | 63205654c0e05e5ffa1c6eef2fbef21dcabd2185 (diff) | |
download | op-kernel-dev-a47c7a6c8aff0563c0ef4adf299268f3c27af0f6.zip op-kernel-dev-a47c7a6c8aff0563c0ef4adf299268f3c27af0f6.tar.gz |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions