From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2020 16:25:55 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2644bc8569baa735ae9c0a92432d6a30c20c1694;p=linux.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "Fix a build problem with x86/curve25519"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/curve25519 - support assemblers with no adx support
---

2644bc8569baa735ae9c0a92432d6a30c20c1694