Merge branch 'topic/dma_control_fsl_acks' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 15 Oct 2014 16:09:09 +0000 (21:39 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 15 Oct 2014 16:09:09 +0000 (21:39 +0530)
1  2 
include/linux/dmaengine.h

Simple merge