git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
[sfrench/cifs-2.6.git]
/
security
/
keys
/
trusted.c
diff --git
a/security/keys/trusted.c
b/security/keys/trusted.c
index 6b804aa4529a171bfab534307903b142c23cf891..c0594cb07adab14f1efeb970a8c0dd85d86a7931 100644
(file)
--- 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,