Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2019 20:32:28 +0000 (12:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2019 20:32:28 +0000 (12:32 -0800)
Pull crypto fix from Herbert Xu:
 "Fix another build problem for Wireguard without Crypto"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm/curve25519 - add arch-specific key generation function


Trivial merge