Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2019 07:09:00 +0000 (23:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2019 07:09:00 +0000 (23:09 -0800)
commit52107c545de1ef684963146d34f3c4ef6922dd99
tree7637b96cd1b0751af6de0721df23b37d5ae15c8f
parent44e56f325b7d63e8a53008956ce7b28e4272a599
parent356690d029e10f1aadebc49819d3908d5f6389fb
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a bug in cavium/nitrox where the callback is invoked prior
  to the DMA unmap"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cavium/nitrox - Invoke callback after DMA unmap