commit 037430078fbbb956a9bd6ada00f528e9d1e4c92c
author Linus Torvalds <torvalds@linux-foundation.org> Fri May 23 16:52:15 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri May 23 16:52:15 2014 -0700
tree 6bfba945b97c1381361aeae9c8396a6e5cfa49a5
parent 1ee1ceafb572f1a925809168267a7962a4289de8
parent c1f43dd9c20d85e66c4d77e284f64ac114abe3f8

Merge tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

Pull dmaengine fixes from Dan Williams:
 "Two fixes for -stable:

   - async_mult() sometimes maps less buffers than initially requested.
      We end up freeing dmaengine_unmap_data on an invalid pool.

   - mv_xor: register write ordering fix"

* tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  dmaengine: fix dmaengine_unmap failure
  dma: mv_xor: Flush descriptors before activating a channel