Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jan 2021 23:26:51 +0000 (15:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jan 2021 23:26:51 +0000 (15:26 -0800)
Pull crypto fix from Herbert Xu:
 "Fix a regression in the cesa driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: marvel/cesa - Fix tdma descriptor on 64-bit


Trivial merge