From: Vinod Koul <vinod.koul@intel.com>
Date: Sat, 16 Nov 2013 06:24:17 +0000 (+0530)
Subject: Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.13-rc1~29^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df12a3178d340319b1955be6b973a4eb84aff754;p=pandora-kernel.git

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

df12a3178d340319b1955be6b973a4eb84aff754
Reading git-diff-tree failed