summaryrefslogtreecommitdiffstats
path: root/security/keys/keyring.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-10-02 19:47:23 +1000
committerJames Morris <james.l.morris@oracle.com>2014-10-02 19:47:23 +1000
commitc867d07e3c861e75509650b8a359351d634db93a (patch)
treef912043f48b9232db284ff67311eae8692918729 /security/keys/keyring.c
parent858f61c4298d858376ca7b9fc2e05677faabd2d5 (diff)
parent1b68bdf9cded82d37e443a20c5ed47bbb084d5dc (diff)
downloadlinux-c867d07e3c861e75509650b8a359351d634db93a.tar.bz2
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/keys/keyring.c')
0 files changed, 0 insertions, 0 deletions