projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f834ec 901d3d4)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2016 16:42:14 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2016 16:42:14 +0000 (09:42 -0700)
commit071e31e254e0e0c438eecba3dba1d6e2d0da36c2
treea0d2761d7dcf00fb202d61adaf87d8f311834bf1tree | snapshot
parent9f834ec18defc369d73ccf9e87a2790bfa05bf46commit | diff
parent901d3d4fee83e9407d91e7178048e2fed6c91f6bcommit | diff
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Kconfig problem that prevented mxc-rnga from being enabled

   - bogus key sizes in qat aes-xts

   - buggy aes-xts code in vmx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: vmx - fix null dereference in p8_aes_xts_crypt
  crypto: qat - fix aes-xts key sizes
  hwrng: mxc-rnga - Fix Kconfig dependency
John Crispins staging tree