tree 6336f60dad2f548f01125c7237fc239aed38b4fd
parent d67ae206ef05198824c2a306c0c0edf2d2088920
parent 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce
author Linus Torvalds <torvalds@linux-foundation.org> 1224532470 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224532470 -0700

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