tree b637d1d99b876ae6ef721bcfe164a1338b958332
parent a7aa96a92eff3c4b2c7df8c8535691a5a487207d
parent 3901c1124ec5099254a9396085f7798153a7293f
author Linus Torvalds <torvalds@linux-foundation.org> 1400664875 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1400664875 +0900

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