Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Dec 2016 01:51:36 +0000 (17:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Dec 2016 01:51:36 +0000 (17:51 -0800)
commit2d706e790f0508dff4fb72eca9b4892b79757feb
tree1c79c1ec8880f5d6184d166d1f423956833724aa
parent8f18e4d03ed8fa5e4a300c94550533bd8ce4ff9a
parent8759fec4af222f338d08f8f1a7ad6a77ca6cb301
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a hash corruption bug in the marvell driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: marvell - Copy IVDIG before launching partial DMA ahash requests
drivers/crypto/marvell/hash.c