Merge branch 'topic/api_caps' into for-linus

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

Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)

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

Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
author Vinod Koul <vinod.koul@intel.com>
Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
committer Vinod Koul <vinod.koul@intel.com>
Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
diff --cc drivers/dma/pl330.c
Simple merge
diff --cc include/linux/dmaengine.h
Simple merge
author	Vinod Koul <vinod.koul@intel.com>
	Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
committer	Vinod Koul <vinod.koul@intel.com>
	Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
		1	2
drivers/dma/pl330.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/dmaengine.h	patch \|	diff1 \|	diff2 \|	blob \| history