Merge branch 'topic/api_caps' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 2 Sep 2013 12:10:40 +0000 (17:40 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 2 Sep 2013 12:10:40 +0000 (17:40 +0530)
1  2 
drivers/dma/pl330.c
include/linux/dmaengine.h

Simple merge
Simple merge