Commit 6391987d6f8ced7d0fafaa1440dcc57bb4b34d8f
Exists in
master
and in
7 other branches
Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 19 changed files Side-by-side Diff
- arch/arm/mach-imx/include/mach/dma-v1.h
- arch/arm/plat-mxc/include/mach/dma.h
- arch/arm/plat-mxc/include/mach/sdma.h
- arch/powerpc/include/asm/fsldma.h
- drivers/dma/Kconfig
- drivers/dma/Makefile
- drivers/dma/amba-pl08x.c
- drivers/dma/dmaengine.c
- drivers/dma/fsldma.c
- drivers/dma/imx-dma.c
- drivers/dma/imx-sdma.c
- drivers/dma/intel_mid_dma.c
- drivers/dma/intel_mid_dma_regs.h
- drivers/dma/mv_xor.c
- drivers/dma/shdma.c
- drivers/dma/ste_dma40.c
- include/linux/amba/pl08x.h
- include/linux/dmaengine.h
- include/linux/intel_mid_dma.h