Merge branch 'topic/dmatest' into for-linus

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

Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)

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

Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)
author Vinod Koul <vinod.koul@intel.com>
Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)
committer Vinod Koul <vinod.koul@intel.com>
Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)
diff --cc Documentation/dmaengine/provider.txt
Simple merge
diff --cc drivers/dma/ste_dma40.c
Simple merge
diff --cc include/linux/dmaengine.h
Simple merge
author	Vinod Koul <vinod.koul@intel.com>
	Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)
committer	Vinod Koul <vinod.koul@intel.com>
	Wed, 6 Sep 2017 16:25:10 +0000 (21:55 +0530)
		1	2
Documentation/dmaengine/provider.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/dmaengine.h	patch \|	diff1 \|	diff2 \|	blob \| history