Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2017 16:31:15 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2017 16:31:15 +0000 (09:31 -0700)
Pull crypto fix from Herbert Xu:
 "This fixes an objtool regression"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/chacha20 - satisfy stack validation 2.0


Trivial merge