diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 06:20:55 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 06:20:55 +0300 |
commit | 48d4ca5639507b8c37e3bd5711e70aedb05dee2c (patch) | |
tree | 39b0c08c88be9874b0e01d1d3794b74cc08e51c0 /scripts/diffconfig | |
parent | 897473fc040fd69e9a4a6da2ac62a4724a4a8619 (diff) | |
parent | 87dcdebd6beb54f183ae874664ba47bf071ebf95 (diff) | |
download | linux-48d4ca5639507b8c37e3bd5711e70aedb05dee2c.tar.xz |
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 'scripts/diffconfig')
0 files changed, 0 insertions, 0 deletions