Linus Torvalds 12ff47e7f5 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma ...

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (37 commits)
  Improve slave/cyclic DMA engine documentation
  dmaengine: pl08x: handle the rest of enums in pl08x_width
  DMA: PL08x: cleanup selection of burst size
  DMA: PL08x: avoid recalculating cctl at each prepare
  DMA: PL08x: cleanup selection of buswidth
  DMA: PL08x: constify plchan->cd and plat->slave_channels
  DMA: PL08x: separately store source/destination cctl
  DMA: PL08x: separately store source/destination slave address
  DMA: PL08x: clean up LLI debugging
  DMA: PL08x: select LLI bus only once per LLI setup
  DMA: PL08x: remove unused constants
  ARM: mxs-dma: reset after disable channel
  dma: intel_mid_dma: remove redundant pci_set_drvdata calls
  dma: mxs-dma: fix unterminated platform_device_id table
  dmaengine: pl330: make platform data optional
  dmaengine: imx-sdma: return proper error if kzalloc fails
  pch_dma: Fix CTL register access issue
  dmaengine: mxs-dma: skip request_irq for NO_IRQ
  dmaengine/coh901318: fix slave submission semantics
  dmaengine/ste_dma40: allow memory buswidth/burst to be configured
  ...

Fix trivial whitespace conflict in drivers/dma/mv_xor.c

2011-08-01 13:46:37 -10:00

..

ioat

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

2011-05-28 12:35:15 -07:00

ipu

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2011-08-01 13:46:37 -10:00

ppc4xx

Merge branch 'old_next' into next

2011-04-06 11:51:12 +05:30

amba-pl08x.c

dmaengine: pl08x: handle the rest of enums in pl08x_width

2011-07-26 15:33:29 +05:30

at_hdmac_regs.h

dmaengine: at_hdmac: implement pause and resume in atc_control

2011-05-09 11:42:54 +05:30

at_hdmac.c

dma: at_hdmac.c: use resource_size

2011-06-06 13:43:59 +05:30

coh901318_lli.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

coh901318_lli.h

…

coh901318.c

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2011-08-01 13:46:37 -10:00

dmaengine.c

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2011-08-01 13:46:37 -10:00

dmatest.c

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

dw_dmac_regs.h

dmaengine/dw_dmac: Update maintainer-ship

2011-05-25 18:30:37 +05:30

dw_dmac.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

2011-05-28 12:35:15 -07:00

ep93xx_dma.c

dma/ep93xx_dma.c: local symbols should be static

2011-06-16 09:47:49 +05:30

fsldma.c

dt/fsldma: fix build warning caused by of_platform_device changes

2011-04-10 23:34:38 -07:00

fsldma.h

fsldma: fix controller lockups

2011-03-11 17:52:36 -08:00

imx-dma.c

ARM i.MX dma: Fix burstsize settings

2011-07-07 09:55:50 +02:00

imx-sdma.c

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2011-08-01 13:46:37 -10:00

intel_mid_dma_regs.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

intel_mid_dma.c

dma: intel_mid_dma: remove redundant pci_set_drvdata calls

2011-07-26 15:33:27 +05:30

iop-adma.c

dma: use BUG_ON correctly in iop-adma.c, v4

2011-03-31 11:07:40 +05:30

iovlock.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

dmaengine: add ep93xx DMA support

2011-06-08 15:10:44 -06:00

Makefile

dmaengine: add ep93xx DMA support

2011-06-08 15:10:44 -06:00

mpc512x_dma.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

mv_xor.c

dma: mv_xor: use resource_size()

2011-07-14 03:32:31 +05:30

mv_xor.h

…

mxs-dma.c

ARM: mxs-dma: reset after disable channel

2011-07-26 15:33:28 +05:30

pch_dma.c

pch_dma: Fix CTL register access issue

2011-07-25 19:11:12 +05:30

pl330.c

dmaengine: pl330: make platform data optional

2011-07-26 15:32:52 +05:30

shdma.c

Merge branch 'common/dma' into sh-latest

2011-06-21 17:59:05 +09:00

shdma.h

dmaengine: shdma: add chcr_ie_bit

2011-06-21 17:56:01 +09:00

ste_dma40_ll.c

dma40: cyclic xfer support

2011-01-30 22:27:21 -08:00

ste_dma40_ll.h

dmaengine/ste_dma40: use AMBA PrimeCell helper macros

2011-07-14 04:09:10 +05:30

ste_dma40.c

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2011-08-01 13:46:37 -10:00

timb_dma.c

mfd: Use mfd cell platform_data for timberdale cells platform bits

2011-05-26 19:45:05 +02:00

TODO

dmaengine: remove ste_dma40 from issue_pending TODO

2011-07-14 04:02:08 +05:30

txx9dmac.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

2010-05-21 17:05:46 -07:00

txx9dmac.h

…