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)
commit13391c60da3308ed9980de0168f74cce6c62ac1d
tree534fdd1189cd67cd0181b0556b2e027e721e49c8
parentf8ad8187c3b536ee2b10502a8340c014204a1af0
parent4f6543f28bb05433d87b6de6c21e9c14c35ecf33
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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