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)
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

1  2 
drivers/crypto/marvell/hash.c

Simple merge