]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'topic/of' into next
authorVinod Koul <vinod.koul@intel.com>
Mon, 16 Dec 2013 03:50:42 +0000 (09:20 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 16 Dec 2013 03:50:42 +0000 (09:20 +0530)
commitec878fec2854510ac224db4ed7604638bcc4d37d
tree3695a0eb991d4005c69ced08a1f742198c1b2b64
parent38cadda2c8de16c227d5f027e59a2a48339fb4ae
parent8010dad55a0ab0e829f3733854e5235eef4e2734
Merge branch 'topic/of' into next

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