tree be99fbf591528060238aa8078d7c3c3db14f6902
parent f8f202348208fa8a2d817b42f250e145fa885620
parent ee97dc7db4cbda33e4241c2d85b42d1835bc8a35
author Linus Torvalds <torvalds@linux-foundation.org> 1391644302 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391644302 -0800

Merge git://git.kernel.org/pub/scm/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