diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-12 22:40:22 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-12 22:40:22 +1000 |
commit | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 (patch) | |
tree | a47e414fb34d91eb012b121d8138c6cee1fe065b /security/keys/keyctl.c | |
parent | a0cfd75fdc46b56978ece383a7d6f6b04e9087ad (diff) | |
parent | a2d61ed525f3458a913147fd02b1a5cf15e7551b (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/keys/keyctl.c')
0 files changed, 0 insertions, 0 deletions