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:
  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

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/Makefile
index a0b6564,d7bc5fd..40e1e00
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -7,5 -7,5 +7,6 @@@ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adm
  obj-$(CONFIG_FSL_DMA) += fsldma.o
  obj-$(CONFIG_MV_XOR) += mv_xor.o
  obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
  obj-$(CONFIG_MX3_IPU) += ipu/
 +obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o