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
- arch/arm/include/asm/hardware/iop_adma.h 0 additions, 2 deletionsarch/arm/include/asm/hardware/iop_adma.h
- drivers/dma/amba-pl08x.c 11 additions, 27 deletionsdrivers/dma/amba-pl08x.c
- drivers/dma/at_hdmac.c 11 additions, 37 deletionsdrivers/dma/at_hdmac.c
- drivers/dma/at_hdmac_regs.h 0 additions, 2 deletionsdrivers/dma/at_hdmac_regs.h
- drivers/dma/coh901318.c 10 additions, 29 deletionsdrivers/dma/coh901318.c
- drivers/dma/dmaengine.h 89 additions, 0 deletionsdrivers/dma/dmaengine.h
- drivers/dma/dw_dmac.c 9 additions, 34 deletionsdrivers/dma/dw_dmac.c
- drivers/dma/dw_dmac_regs.h 0 additions, 1 deletiondrivers/dma/dw_dmac_regs.h
- drivers/dma/ep93xx_dma.c 6 additions, 19 deletionsdrivers/dma/ep93xx_dma.c
- drivers/dma/fsldma.c 7 additions, 17 deletionsdrivers/dma/fsldma.c
- drivers/dma/fsldma.h 0 additions, 1 deletiondrivers/dma/fsldma.h
- drivers/dma/imx-dma.c 7 additions, 32 deletionsdrivers/dma/imx-dma.c
- drivers/dma/imx-sdma.c 6 additions, 17 deletionsdrivers/dma/imx-sdma.c
- drivers/dma/intel_mid_dma.c 10 additions, 28 deletionsdrivers/dma/intel_mid_dma.c
- drivers/dma/intel_mid_dma_regs.h 0 additions, 2 deletionsdrivers/dma/intel_mid_dma_regs.h
- drivers/dma/ioat/dma.c 10 additions, 11 deletionsdrivers/dma/ioat/dma.c
- drivers/dma/ioat/dma.h 0 additions, 23 deletionsdrivers/dma/ioat/dma.h
- drivers/dma/ioat/dma_v2.c 5 additions, 8 deletionsdrivers/dma/ioat/dma_v2.c
- drivers/dma/ioat/dma_v3.c 7 additions, 5 deletionsdrivers/dma/ioat/dma_v3.c
- drivers/dma/iop-adma.c 13 additions, 39 deletionsdrivers/dma/iop-adma.c
Loading
Please register or sign in to comment