Merge branch 'coh' into dmaengine

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