Merge branch 'topic/api_caps' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 4 Sep 2013 13:06:53 +0000 (18:36 +0530)
commitbd127639f43ed00f721b403c7c252caa19d0f613
treefbecc9ae6b7a0b41c061aafff06f1fabd7c1e73b
parent265d9c673d47fcd5812d69dc07104b706285de56
parentdbaf6d85114bd2043f3ca758f71f9f7e4e579601
Merge branch 'topic/api_caps' into for-linus
drivers/dma/pl330.c
include/linux/dmaengine.h