diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:20:55 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:20:55 +0900 |
commit | 2fc3750b483ab74709f99072ac6ccc5ea9f0ae13 (patch) | |
tree | d7d6f9132b0086ffdf0b1bb544b9f527ad98199b /crypto/asymmetric_keys/pkcs7_parser.h | |
parent | 707bbd9bf2d2a811bddcaa582b998d110fc371f4 (diff) | |
parent | acdb0b3ef0b5f05a8b4f14cf973532ea68da93a5 (diff) | |
download | linux-crypto-2fc3750b483ab74709f99072ac6ccc5ea9f0ae13.tar.gz linux-crypto-2fc3750b483ab74709f99072ac6ccc5ea9f0ae13.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a sporadic build failure in the qat driver as well as a
memory corruption bug in rsa-pkcs1pad"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct
crypto: qat - make qat_asym_algs.o depend on asn1 headers
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.h')
0 files changed, 0 insertions, 0 deletions