From: Linus Torvalds Date: Mon, 20 Oct 2008 19:54:30 +0000 (-0700) Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b91385236c00031c64b42b44db8068ad38a5ea11;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'next' of git://git./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 --- b91385236c00031c64b42b44db8068ad38a5ea11