projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 78d4256 8c98ebd)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Apr 2015 20:51:05 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Apr 2015 20:51:05 +0000 (13:51 -0700)
commitd89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e
tree0cb5687b3b32f0e08e42ed8b4a9b55fffdf96c30tree | snapshot (tar.gz zip)
parent78d425677217b655ed36c492a070b5002832fc73commit | diff
parent8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6bcommit | diff
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