tree f2bc8b1d517ece7520dae853e2a66f881b1e4838
parent 320b34e3e067e08331725df122583afdca10f811
parent de614e561b9c633073caae8f86399aa8923ef85d
author Linus Torvalds <torvalds@linux-foundation.org> 1369760978 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1369760978 -0700

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