Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 21:26:36 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 21:26:36 +0000 (14:26 -0700)
commit2a058f388db8f2bf83ed43f6170a2bb79567dedb
tree6d20da1081029e71d72c287249f037638eb9b17e
parent865d872280c848dc78b060088171724c3fb98bbb
parenta1cae34e23b1293eccbcc8ee9b39298039c3952a
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull another crypto fix from Herbert Xu:
 "Fix ICV corruption in s390/ghash when the same tfm is used by more
  than one thread"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390/ghash - Fix incorrect ghash icv buffer handling.