tree 6d20da1081029e71d72c287249f037638eb9b17e
parent 865d872280c848dc78b060088171724c3fb98bbb
parent a1cae34e23b1293eccbcc8ee9b39298039c3952a
author Linus Torvalds <torvalds@linux-foundation.org> 1432329996 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1432329996 -0700

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