Merge remote-tracking branch 'slave-dma/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/dma/dw/core.c
Simple merge
diff --cc drivers/dma/imx-sdma.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 05:56:45 +0000 (16:56 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/dw/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-sdma.c	patch \|	diff1 \|	diff2 \|	blob \| history