| commit | fd3958eac387593d02e4d4287658ba04bcdb235a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 18 11:07:18 2021 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 18 11:07:18 2021 -0800 |
| tree | ed25f9c826f2c1841babf923f8431017aa073126 | |
| parent | 19c329f6808995b142b3966301f217c831e7cf31 [diff] | |
| parent | 382811940303f7cd01d0f3dcdf432dfd89c5a98e [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "A Kconfig dependency issue with omap-sham and a divide by zero in xor on some platforms" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: omap-sham - Fix link error without crypto-engine crypto: xor - Fix divide error in do_xor_speed()