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)
commit1960e8eabcba2749db9443adb2a5d93e4dabf590
tree17a757b4d80872d99be54dfd2caa0d83d3c00125
parent0b07194bb55ed836c2cc7c22e866b87a14681984
parent4635742d1cef5ee5f217f89310a8782ebb4e25dd
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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