summaryrefslogtreecommitdiff
path: root/security/keys/key.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-12-16 12:49:10 +1100
committerJames Morris <james.l.morris@oracle.com>2014-12-16 12:49:10 +1100
commitd0bffab0439fb7edaee09677b636eef5991e8b80 (patch)
tree4437686bf7e9bea8f6444f23850f21a7b9f360a7 /security/keys/key.c
parent988adfdffdd43cfd841df734664727993076d7cb (diff)
parent63a0eb7891bdf3ef32ecb6b01eb09106df646c10 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'security/keys/key.c')
0 files changed, 0 insertions, 0 deletions