Merge branch 'fixes' into next

author Vinod Koul <vkoul@kernel.org>

Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)

committer Vinod Koul <vkoul@kernel.org>

Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)
author Vinod Koul <vkoul@kernel.org>
Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)
committer Vinod Koul <vkoul@kernel.org>
Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)
diff --cc drivers/dma/sprd-dma.c
Simple merge
diff --cc drivers/dma/xilinx/xilinx_dma.c
Simple merge
author	Vinod Koul <vkoul@kernel.org>
	Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)
committer	Vinod Koul <vkoul@kernel.org>
	Thu, 14 Nov 2019 10:32:51 +0000 (16:02 +0530)
		1	2
drivers/dma/sprd-dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/xilinx/xilinx_dma.c	patch \|	diff1 \|	diff2 \|	blob \| history