diff options
| author | James Morris | 2014-09-22 14:54:56 +0200 |
|---|---|---|
| committer | James Morris | 2014-09-22 14:54:56 +0200 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /security/keys/trusted.c | |
| parent | Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel in... (diff) | |
| parent | KEYS: Check hex2bin()'s return when generating an asymmetric key ID (diff) | |
| download | kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.gz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.zip | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/trusted.c')
| -rw-r--r-- | security/keys/trusted.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c index 6b804aa4529a..c0594cb07ada 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -1096,7 +1096,6 @@ struct key_type key_type_trusted = { .name = "trusted", .instantiate = trusted_instantiate, .update = trusted_update, - .match = user_match, .destroy = trusted_destroy, .describe = user_describe, .read = trusted_read, |