Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Oct 2020 17:43:52 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Oct 2020 17:43:52 +0000 (10:43 -0700)
Pull crypto fix from Herbert Xu:
 "This fixes a regression in x86/poly1305"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/poly1305 - add back a needed assignment


Trivial merge