Merge branch 'samsung/dma' into next/dt

Required as a dependency for samsung/dt changes.