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
..
bus.h	ARM: 6758/1: amba: support pm ops	2011-02-23 16:26:46 +00:00
clcd.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
kmi.h	[ARM] Move AMBA include files to include/linux/amba/	2006-01-07 13:52:45 +00:00
mmci.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
pl08x.h	dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers	2011-09-19 15:13:06 +05:30
pl022.h	spi/pl022: get rid of chipinfo dev pointer	2010-10-12 21:37:37 -06:00
pl061.h	gpio: pl061: add DT binding support	2011-10-26 23:15:28 +02:00
pl093.h	ARM: PL093: Header file for PL093 SSMC PrimeCell	2009-07-30 23:22:54 +01:00
pl330.h	DMA: PL330: Update PL330 DMA API driver	2011-09-14 11:10:01 +05:30
serial.h	amba pl011: workaround for uart registers lockup	2011-06-16 12:01:57 -07:00