]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6ffd6cad1854a573bdd8530761e1b4ba80b7d905
treee2601bd3363585cfa076ae6255b1a8099076aacf
parent6836424192a51749912311724a9d60e60ceef01d
parentd2d4ef96b7b1d64a303eea43c48e7489c811b44a
Merge branch 'linus' of git://git.kernel.org/pub/scm/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