From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 May 2013 17:09:38 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.10-rc4~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30a9e501437e9319a90d66cd8e701f837deacc90;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull crypto fixes from Herbert Xu:
 "This push fixes a crash in the new sha256_ssse3 driver as well as a
  DMA setup/teardown bug in caam"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha256_ssse3 - fix stack corruption with SSSE3 and AVX implementations
  crypto: caam - fix inconsistent assoc dma mapping direction
---

30a9e501437e9319a90d66cd8e701f837deacc90