Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2016 18:29:00 +0000 (14:29 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2016 18:29:00 +0000 (14:29 -0400)
commitd1fdafa10f80292ba31c2f45a3e94805873575a8
tree5ac8703baba18bc4e23cf8be7e97f8121d8fcfba
parentef0e1ea8856bed6ff8394d3dfe77f2cab487ecea
parente67479b13ede47cc2f5beb5b51e67fdb30778ee8
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a number of memory corruption bugs in the newly added
  sha256-mb/sha256-mb code"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha512-mb - fix ctx pointer
  crypto: sha256-mb - fix ctx pointer and digest copy