Merge branch 'samsung_dma' into next