Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/mv_xor.c

diff --cc drivers/dma/coh901318.c
Simple merge

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/imx-sdma.c
Simple merge

diff --cc drivers/dma/ipu/ipu_idmac.c
Simple merge

diff --cc drivers/dma/ste_dma40.c
Simple merge