From: Andrew Morton <akpm@osdl.org>

Fix reject due to clash between these two git trees.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/dma/ioatdma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/dma/ioatdma.c~git-ioat-vs-git-md-accel drivers/dma/ioatdma.c
--- a/drivers/dma/ioatdma.c~git-ioat-vs-git-md-accel
+++ a/drivers/dma/ioatdma.c
@@ -336,7 +336,7 @@ ioat_tx_submit(struct dma_async_tx_descr
 	list_splice_init(&desc->group_list, ioat_chan->used_desc.prev);
 
 	ioat_chan->pending += desc->group_count;
-	if (ioat_chan->pending >= 20) {
+	if (ioat_chan->pending >= 4) {
 		append = 1;
 		ioat_chan->pending = 0;
 	}
_