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)
commit41ba50b0572e90ed3d24fe4def54567e9050bc47
tree7e9cda30663fafd49ee7c99ffd701f42d8fc5de3
parent9480b4e75b7108ee68ecf5bc6b4bd68e8031c521
parentc3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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