Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
commitdb06816cb9ceb21a2bf24122407b7b4fe419c3fc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:31 +0000 (30 16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:31 +0000 (30 16:46 -0700)
tree25a96cbc392edfe35ea6dcfaa4b0b2a7601d779d
parent784b1d6b21cb25791b68276af27a7c2321d5a86f
parent808347f6a31792079e345ec865e9cfcb6e8ae6b2
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:
  dmaengine: at_hdmac: add DMA slave transfers
  dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller
  dmaengine: dmatest: correct thread_count while using multiple thread per channel
  dmaengine: dmatest: add a maximum number of test iterations
  drivers/dma: Remove unnecessary semicolons
  drivers/dma/fsldma.c: Remove unnecessary semicolons
  dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
  fsldma: do not clear bandwidth control bits on the 83xx controller
  fsldma: enable external start for the 83xx controller
  fsldma: use PCI Read Multiple command
drivers/dma/Kconfig
drivers/dma/Makefile