From: Linus Torvalds Date: Sat, 14 Dec 2019 20:32:28 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v5.5-rc2~12 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/f791ede32a14151a313783e1105049a137bc13c8 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 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 --- f791ede32a14151a313783e1105049a137bc13c8