Merge branch 'fixes' into next

This brings in the rz-dmac fixes which are in fixes

diff --cc drivers/dma/dw-edma/dw-edma-core.c
Simple merge

diff --cc drivers/dma/dw-edma/dw-hdma-v0-core.c
Simple merge

diff --cc drivers/dma/fsl-edma-main.c
Simple merge

diff --cc drivers/dma/sh/rz-dmac.c
Simple merge

diff --cc drivers/dma/xilinx/xdma.c
Simple merge