projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7aa96a 3901c11)
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)
commit1f5518b4e7febc2a1026fba2ff311ba54be1abc4
treeb637d1d99b876ae6ef721bcfe164a1338b958332tree | snapshot
parenta7aa96a92eff3c4b2c7df8c8535691a5a487207dcommit | diff
parent3901c1124ec5099254a9396085f7798153a7293fcommit | diff
Merge git://git./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
Freescale DCU DRM driver