Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-linus

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

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

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