Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorVinod Koul <vinod.koul@intel.com>
Sat, 16 Nov 2013 06:24:17 +0000 (11:54 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 16 Nov 2013 06:32:36 +0000 (12:02 +0530)
commitdf12a3178d340319b1955be6b973a4eb84aff754
tree2b9c68f8a6c299d1e5a4026c60117b5c00d46008
parent2f986ec6fa57a5dcf77f19f5f0d44b1f680a100f
parent82a1402eaee5dab1f3ab2d5aa4c316451374c5af
Merge commit 'dmaengine-3.13-v2' of git://git./linux/kernel/git/djbw/dmaengine

Pull dmaengine changes from Dan

1/ Bartlomiej and Dan finalized a rework of the dma address unmap
   implementation.

2/ In the course of testing 1/ a collection of enhancements to dmatest
   fell out.  Notably basic performance statistics, and fixed / enhanced
   test control through new module parameters 'run', 'wait', 'noverify',
   and 'verbose'.  Thanks to Andriy and Linus for their review.

3/ Testing the raid related corner cases of 1/ triggered bugs in the
   recently added 16-source operation support in the ioatdma driver.

4/ Some minor fixes / cleanups to mv_xor and ioatdma.

Conflicts:
drivers/dma/dmatest.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
14 files changed:
drivers/dma/amba-pl08x.c
drivers/dma/at_hdmac.c
drivers/dma/dmaengine.c
drivers/dma/dmatest.c
drivers/dma/dw/core.c
drivers/dma/fsldma.c
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma_v3.c
drivers/dma/iop-adma.c
drivers/dma/mv_xor.c
drivers/dma/pl330.c
drivers/dma/ppc4xx/adma.c
drivers/dma/txx9dmac.c
include/linux/dmaengine.h