projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f21f7fa 24568b4)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Sep 2018 06:29:42 +0000 (08:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Sep 2018 06:29:42 +0000 (08:29 +0200)
commit4ca719a338d5ebb713e0ae56c208a689f1efe20f
treee2601bd3363585cfa076ae6255b1a8099076aacftree | snapshot
parentf21f7fa263ac005713f0a7a43179c5aea0fabe85commit | diff
parent24568b47d48ec8c906fd0f589489a08b17e1edcacommit | diff
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Crypto stuff from Herbert:
  "This push fixes a potential boot hang in ccp and an incorrect
   CPU capability check in aegis/morus on x86."

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2
  crypto: ccp - add timeout support in the SEV command
John Crispins staging tree