]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 14dc152 ebf7460)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 09:34:35 +0000 (18:34 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 09:34:35 +0000 (18:34 +0900)
commiteea6333d0961e4e7b6c755c2b777b787643f55d0
treeb637d1d99b876ae6ef721bcfe164a1338b958332tree | snapshot
parent14dc15278d6d633631bade80e522c583d95106e8commit | diff
parentebf7460c6c6e2adbfaa06fe044078cea013ed6f2commit | 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
Linux Kernel Source Tree.