Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2018 17:09:45 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2018 17:09:45 +0000 (10:09 -0700)
Pull crypto fix from Herbert Xu:
 "Fix a memory corruption in the padlock-aes driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock-aes - Fix Nano workaround data corruption


Trivial merge