From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Apr 2015 20:51:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e;p=deliverable%2Flinux.git

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

Pull crypto fixes from Herbert Xu:
 "This push fixes a build problem with img-hash under non-standard
  configurations and a serious regression with sha512_ssse3 which can
  lead to boot failures"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
  crypto: x86/sha512_ssse3 - fixup for asm function prototype change
---

d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e