tree 2b9c68f8a6c299d1e5a4026c60117b5c00d46008
parent 2f986ec6fa57a5dcf77f19f5f0d44b1f680a100f
parent 82a1402eaee5dab1f3ab2d5aa4c316451374c5af
author Vinod Koul <vinod.koul@intel.com> 1384583057 +0530
committer Vinod Koul <vinod.koul@intel.com> 1384583556 +0530

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/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>