| commit | 4ca719a338d5ebb713e0ae56c208a689f1efe20f | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Sep 19 08:29:42 2018 +0200 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Sep 19 08:29:42 2018 +0200 |
| tree | e2601bd3363585cfa076ae6255b1a8099076aacf | |
| parent | f21f7fa263ac005713f0a7a43179c5aea0fabe85 [diff] | |
| parent | 24568b47d48ec8c906fd0f589489a08b17e1edca [diff] |
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