Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

Browse source

...

This commit is contained in:

James Morris 2014-08-06 00:52:01 +10:00

parent 103ae675b1 cf5b50fd2d

commit 478d085524

5 changed files with 34 additions and 81 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

crypto/asymmetric_keys/pkcs7_key_type.c

View file

61

crypto/asymmetric_keys/pkcs7_trust.c

View file

6

crypto/asymmetric_keys/pkcs7_verify.c

View file

42

crypto/asymmetric_keys/x509_public_key.c

View file

4

include/crypto/public_key.h

View file