From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jan 2021 19:07:18 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: accepted/tizen/unified/20230118.172025~8061
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd3958eac387593d02e4d4287658ba04bcdb235a;p=platform%2Fkernel%2Flinux-rpi.git

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()
---

fd3958eac387593d02e4d4287658ba04bcdb235a