linux/drivers/dma
Linus Torvalds 4cb865deec 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: (33 commits)
  x86: poll waiting for I/OAT DMA channel status
  maintainers: add dma engine tree details
  dmaengine: add TODO items for future work on dma drivers
  dmaengine: Add API documentation for slave dma usage
  dmaengine/dw_dmac: Update maintainer-ship
  dmaengine: move link order
  dmaengine/dw_dmac: implement pause and resume in dwc_control
  dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback
  dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT
  dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS
  dmaengine/dw_dmac: don't call callback routine in case dmaengine_terminate_all() is called
  dmaengine: at_hdmac: pause: no need to wait for FIFO empty
  pch_dma: modify pci device table definition
  pch_dma: Support new device ML7223 IOH
  pch_dma: Support I2S for ML7213 IOH
  pch_dma: Fix DMA setting issue
  pch_dma: modify for checkpatch
  pch_dma: fix dma direction issue for ML7213 IOH video-in
  dmaengine: at_hdmac: use descriptor chaining help function
  dmaengine: at_hdmac: implement pause and resume in atc_control
  ...

Fix up trivial conflict in drivers/dma/dw_dmac.c
2011-05-28 12:35:15 -07:00
..
ioat
ipu
ppc4xx
Kconfig
Makefile
TODO
amba-pl08x.c
at_hdmac.c
at_hdmac_regs.h
coh901318.c
coh901318_lli.c
coh901318_lli.h
dmaengine.c
dmatest.c
dw_dmac.c
dw_dmac_regs.h
fsldma.c
fsldma.h
imx-dma.c
imx-sdma.c
intel_mid_dma.c
intel_mid_dma_regs.h
iop-adma.c
iovlock.c
mpc512x_dma.c
mv_xor.c
mv_xor.h
mxs-dma.c
pch_dma.c
pl330.c
shdma.c
shdma.h
ste_dma40.c
ste_dma40_ll.c
ste_dma40_ll.h
timb_dma.c
txx9dmac.c
txx9dmac.h