]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
projects / people / arne_f / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Arne's tree of linux kernel.