Merge branch 'topic/alloc_removal' into for-linus

diff --cc drivers/dma/amba-pl08x.c
Simple merge

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

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

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