Merge branch 'rmk_cookie_fixes2' into next
Conflicts:
drivers/dma/imx-dma.c
drivers/dma/pl330.c
Signed-off-by:
Vinod Koul <vinod.koul@linux.intel.com>
Showing
drivers/dma/dmaengine.h
0 → 100644
Please register or sign in to comment