Linus Torvalds fba9569924 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits) dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle dmaengine/ep93xx_dma: add module.h include pch_dma: Reduce wasting memory pch_dma: Fix suspend issue dma/timberdale: free_irq() on an error path dma: shdma: transfer based runtime PM dmaengine: shdma: protect against the IRQ handler dmaengine i.MX DMA/SDMA: add missing include of linux/module.h dmaengine: delete redundant chan_id and chancnt initialization in dma drivers dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers serial: sh-sci: don't filter on DMA device, use only channel ID ARM: SAMSUNG: Remove Samsung specific enum type for dma direction ASoC: Samsung: Update DMA interface spi/s3c64xx: Merge dma control code spi/s3c64xx: Add support DMA engine API ARM: SAMSUNG: Remove S3C-PL330-DMA driver ARM: S5P64X0: Use generic DMA PL330 driver ARM: S5PC100: Use generic DMA PL330 driver ARM: S5PV210: Use generic DMA PL330 driver ... Fix up fairly trivial conflicts in - arch/arm/mach-exynos4/{Kconfig,clock.c} - arch/arm/mach-s5p64x0/dma.c		2011-11-04 18:02:25 -07:00
..
ioat	ioat: fix xor_idx_to_desc	2011-08-03 22:25:06 -07:00
ipu	[media] dmaengine: ipu-idmac: add support for the DMA_PAUSE control	2011-11-03 18:28:33 -02:00
ppc4xx
amba-pl08x.c	dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool	2011-09-19 15:13:16 +05:30
at_hdmac.c	dmaengine: delete redundant chan_id and chancnt initialization in dma drivers	2011-09-20 11:51:33 +05:30
at_hdmac_regs.h	dmaengine: at_hdmac: add wrappers for testing channel state	2011-08-19 18:39:59 +05:30
coh901318.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2011-08-01 13:46:37 -10:00
coh901318_lli.c
coh901318_lli.h
dmaengine.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-08-04 16:43:43 -10:00
dmatest.c	dmatest: make dmatest threads freezable	2011-08-29 18:01:27 +05:30
dw_dmac.c	dmaengine: delete redundant chan_id and chancnt initialization in dma drivers	2011-09-20 11:51:33 +05:30
dw_dmac_regs.h
ep93xx_dma.c	dmaengine/ep93xx_dma: add module.h include	2011-10-16 13:52:44 +05:30
fsldma.c
fsldma.h
imx-dma.c	dmaengine i.MX DMA/SDMA: add missing include of linux/module.h	2011-09-21 11:29:19 +05:30
imx-sdma.c	dmaengine i.MX DMA/SDMA: add missing include of linux/module.h	2011-09-21 11:29:19 +05:30
intel_mid_dma.c	dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle	2011-10-16 17:16:45 +05:30
intel_mid_dma_regs.h
iop-adma.c
iovlock.c
Kconfig	DMA: PL330: Update PL330 DMA API driver	2011-09-14 11:10:01 +05:30
Makefile
mpc512x_dma.c	dmaengine: delete redundant chan_id and chancnt initialization in dma drivers	2011-09-20 11:51:33 +05:30
mv_xor.c	dma: mv_xor: use resource_size()	2011-07-14 03:32:31 +05:30
mv_xor.h
mxs-dma.c	mxs-dma: enable CLKGATE before accessing registers	2011-08-16 18:33:42 +05:30
pch_dma.c	pch_dma: Reduce wasting memory	2011-10-12 10:51:24 +05:30
pl330.c	Merge branch 'samsung_dma' into next	2011-09-21 11:53:30 +05:30
shdma.c	dma: shdma: transfer based runtime PM	2011-09-28 10:07:40 +05:30
shdma.h	dma: shdma: transfer based runtime PM	2011-09-28 10:07:40 +05:30
ste_dma40.c	dmaengine/ste_dma40: fix memory leak due to prepared descriptors	2011-09-05 17:11:38 +05:30
ste_dma40_ll.c
ste_dma40_ll.h	dmaengine/ste_dma40: use AMBA PrimeCell helper macros	2011-07-14 04:09:10 +05:30
timb_dma.c	dma/timberdale: free_irq() on an error path	2011-10-07 10:23:11 +05:30
TODO	dmaengine: remove ste_dma40 from issue_pending TODO	2011-07-14 04:02:08 +05:30
txx9dmac.c
txx9dmac.h