Merge branch 'topic/of' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:06:24 +0000 (21:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:06:24 +0000 (21:36 +0530)
commit0adcdeed6f87ac7230c9a0364ac785b8e70ad275
tree77fd04c067b024887d801778227501762bdf2ddd
parent4fce628f685945df4fd6fa1cab6f7eb397dc9267
parent8010dad55a0ab0e829f3733854e5235eef4e2734
Merge branch 'topic/of' into for-linus

Conflicts:
drivers/dma/mmp_pdma.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/dmaengine.c
drivers/dma/mmp_pdma.c
include/linux/dmaengine.h