From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Feb 2019 07:09:00 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52107c545de1ef684963146d34f3c4ef6922dd99;p=android-x86%2Fkernel.git

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

52107c545de1ef684963146d34f3c4ef6922dd99