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)
commit355cdafe14d72c616dc804a756f3af4f4df4fe8c
tree592ef60b65da9a539daa84f5d1cf52cf483b362b
parent4770ee44359ad454992d544cf14f8d330a93f5ca
parentca38ff133eb85b64e62b508a7726ea0247edd359
Merge branch 'topic/api_caps' into for-linus
drivers/dma/pl330.c
include/linux/dmaengine.h