From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2015 21:26:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.1-rc5~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2a058f388db8f2bf83ed43f6170a2bb79567dedb;p=linux-2.6-block.git

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.
---

2a058f388db8f2bf83ed43f6170a2bb79567dedb