linux/drivers/dma
Linus Torvalds dcded10f6d 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: (30 commits)
  DMAENGINE: at_hdmac: locking fixlet
  DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
  dma: dmatest: fix potential sign bug
  ioat2: catch and recover from broken vtd configurations v6
  DMAENGINE: add runtime slave control to COH 901 318 v3
  DMAENGINE: add runtime slave config to DMA40 v3
  DMAENGINE: generic slave channel control v3
  dmaengine: Driver for Topcliff PCH DMA controller
  intel_mid: Add Mrst & Mfld DMA Drivers
  drivers/dma: Eliminate a NULL pointer dereference
  dma/timb_dma: compile warning on 32 bit
  DMAENGINE: ste_dma40: support older silicon
  DMAENGINE: ste_dma40: support disabling physical channels
  DMAENGINE: ste_dma40: no disabled phy channels on ux500
  DMAENGINE: ste_dma40: fix suspend bug
  DMAENGINE: ste_dma40: add DB8500 memcpy channels
  DMAENGINE: ste_dma40: no flow control on memcpy
  DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
  DMAENGINE: ste_dma40: allocate LCLA dynamically
  DMAENGINE: ste_dma40: no premature stop
  ...

Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
2010-08-09 21:00:07 -07:00
..
ioat
ipu
ppc4xx
at_hdmac_regs.h
at_hdmac.c
coh901318_lli.c
coh901318_lli.h
coh901318.c
dmaengine.c
dmatest.c
dw_dmac_regs.h
dw_dmac.c
fsldma.c
fsldma.h
intel_mid_dma_regs.h
intel_mid_dma.c
iop-adma.c
iovlock.c
Kconfig
Makefile
mpc512x_dma.c
mv_xor.c
mv_xor.h
pch_dma.c
pl330.c
shdma.c
shdma.h
ste_dma40_ll.c
ste_dma40_ll.h
ste_dma40.c
timb_dma.c
txx9dmac.c
txx9dmac.h