From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 May 2014 09:34:35 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.15-rc6~19
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/1f5518b4e7febc2a1026fba2ff311ba54be1abc4

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
---

1f5518b4e7febc2a1026fba2ff311ba54be1abc4