]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 320b34e de614e5)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 May 2013 17:09:38 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 May 2013 17:09:38 +0000 (10:09 -0700)
commit30a9e501437e9319a90d66cd8e701f837deacc90
treef2bc8b1d517ece7520dae853e2a66f881b1e4838tree | snapshot
parent320b34e3e067e08331725df122583afdca10f811commit | diff
parentde614e561b9c633073caae8f86399aa8923ef85dcommit | diff
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
Michael's Linux tree.