From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Feb 2014 23:51:42 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.14-rc2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4293242db153512dcfc7e7af9af683e5b97dd4ce;p=profile%2Fcommon%2Fkernel-common.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a number of concurrency issues on s390 where multiple users
  of the same crypto transform may clobber each other's results"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390 - fix des and des3_ede ctr concurrency issue
  crypto: s390 - fix des and des3_ede cbc concurrency issue
  crypto: s390 - fix concurrency issue in aes-ctr mode
---

4293242db153512dcfc7e7af9af683e5b97dd4ce