Merge branch 'topic/mtek' into for-linus

author Vinod Koul <vinod.koul@intel.com>

Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)

committer Vinod Koul <vinod.koul@intel.com>

Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)
author Vinod Koul <vinod.koul@intel.com>
Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)
committer Vinod Koul <vinod.koul@intel.com>
Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/dma/Makefile
Simple merge
author	Vinod Koul <vinod.koul@intel.com>
	Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)
committer	Vinod Koul <vinod.koul@intel.com>
	Tue, 10 Apr 2018 03:25:26 +0000 (08:55 +0530)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history