Merge branch 'coh' into dmaengine

author Dan Williams <[email protected]>

Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)

committer Dan Williams <[email protected]>

Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
author Dan Williams <[email protected]>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
committer Dan Williams <[email protected]>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
diff --cc drivers/dma/dmatest.c
Simple merge
diff --cc drivers/dma/ioat/dma_v2.c
Simple merge
diff --cc drivers/dma/ipu/ipu_idmac.c
Simple merge
author	Dan Williams <[email protected]>
	Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
committer	Dan Williams <[email protected]>
	Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
		1	2
drivers/dma/dmatest.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/dma_v2.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/ipu/ipu_idmac.c	patch \|	diff1 \|	diff2 \|	blob \| history