Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: fsldma: allow Freescale Elo DMA driver to be compiled as a module fsldma: remove internal self-test from Freescale Elo DMA driver drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL dmatest: properly handle duplicate DMA channels drivers/dma/ioat_dma.c: drop code after return async_tx: make async_tx_run_dependencies() easier to read
Showing
- crypto/async_tx/async_tx.c 16 additions, 18 deletionscrypto/async_tx/async_tx.c
- drivers/dma/Kconfig 5 additions, 5 deletionsdrivers/dma/Kconfig
- drivers/dma/dmatest.c 6 additions, 1 deletiondrivers/dma/dmatest.c
- drivers/dma/fsldma.c 88 additions, 182 deletionsdrivers/dma/fsldma.c
- drivers/dma/fsldma.h 1 addition, 0 deletionsdrivers/dma/fsldma.h
- drivers/dma/ioat_dma.c 0 additions, 2 deletionsdrivers/dma/ioat_dma.c
Loading
Please register or sign in to comment