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)
commitcf6c0ab54daeb614ae79bdd0168e8b7ec2650134
treea5dbdf23ae9184edce0cab7944df9798da309a1d
parent2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e
parentb80719b6bd083130c112cb4d3e5329a164eef4c3
Merge branch 'topic/dma_control_fsl_acks' into for-linus
include/linux/dmaengine.h