diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:34:35 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:34:35 +0900 |
| commit | 1f5518b4e7febc2a1026fba2ff311ba54be1abc4 (patch) | |
| tree | b637d1d99b876ae6ef721bcfe164a1338b958332 /drivers/ata | |
| parent | a7aa96a92eff3c4b2c7df8c8535691a5a487207d (diff) | |
| parent | 3901c1124ec5099254a9396085f7798153a7293f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a NULL pointer dereference on allocation failure in caam,
as well as a regression in the ctr mode on s390 that was added with
the recent concurrency fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: s390 - fix aes,des ctr mode concurrency finding.
crypto: caam - add allocation failure handling in SPRINTFCAT macro
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions