diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-05 18:10:00 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-05 18:10:00 (GMT) |
| commit | bc4dee5aa72723632a1f83fd0d3720066c93b433 (patch) | |
| tree | fb0b3b258451a3870a697db73665a805abc5342f /drivers/ata | |
| parent | 56291b271be032057c782e357ca728b27d89ff70 (diff) | |
| parent | 8b18e2359aff2ab810aba84cebffc9da07fef78f (diff) | |
| download | linux-bc4dee5aa72723632a1f83fd0d3720066c93b433.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 regression in the cryptd code that breaks certain
accelerated AED algorithms as well as an older regression in the
caam driver that breaks IPsec"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix IV loading for authenc (giv)decryption
crypto: cryptd - Use correct tfm object for AEAD tracking
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions