projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffd565e 4a6b27b)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2016 17:25:16 +0000 (10:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2016 17:25:16 +0000 (10:25 -0700)
Pull crypto fix from Herbert Xu:
 "Fix a regression that causes sha-mb to crash"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI


Trivial merge
John Crispins staging tree