Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2021 19:07:18 +0000 (11:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2021 19:07:18 +0000 (11:07 -0800)
commitfd3958eac387593d02e4d4287658ba04bcdb235a
treeed25f9c826f2c1841babf923f8431017aa073126
parent19c329f6808995b142b3966301f217c831e7cf31
parent382811940303f7cd01d0f3dcdf432dfd89c5a98e
Merge branch 'linus' of git://git./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()