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)
commit7123fd41e35a2868cbc2fc611c15a745692b3d78
tree3a9c9eba5025b65e1785998af7adc99a42c8d4c6
parent0585df468e8f4481b78256a2bf09449290bfcbf3
parent46d8c4b28652d35dc6cfb5adf7f54e102fc04384
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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