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
..
Kconfig
MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
2011-10-24 23:34:24 +01:00
Makefile
spi: remove obsolete spi-s3c24xx-gpio driver
2011-07-04 10:52:58 -06:00
spi-altera.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-ath79.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-atmel.c
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
2011-10-29 07:28:36 -07:00
spi-au1550.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-bfin-sport.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-bfin5xx.c
spi: irq: Remove IRQF_DISABLED
2011-10-24 14:14:40 +02:00
spi-bitbang-txrx.h
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-bitbang.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-butterfly.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-coldfire-qspi.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-davinci.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-dw-mid.c
spi: spi-dw: fix all sparse warnings
2011-09-21 09:41:48 -06:00
spi-dw-mmio.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-dw-pci.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-dw.c
spi: spi-dw: fix all sparse warnings
2011-09-21 09:41:48 -06:00
spi-dw.h
spi: spi-dw: fix all sparse warnings
2011-09-21 09:41:48 -06:00
spi-ep93xx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-fsl-espi.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-fsl-lib.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-fsl-lib.h
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-fsl-spi.c
spi: Fix WARN when removing spi-fsl-spi module
2011-09-23 17:28:29 -06:00
spi-gpio.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-imx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-lm70llp.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-mpc52xx-psc.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-mpc52xx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-mpc512x-psc.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-nuc900.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-oc-tiny.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-omap-100k.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-omap-uwire.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-omap2-mcspi.c
OMAP: SPI: Fix the trying to free nonexistent resource error
2011-10-24 13:44:30 +02:00
spi-orion.c
spi: Convert uses of struct resource * to resource_size(ptr)
2011-06-10 23:43:41 -06:00
spi-pl022.c
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
2011-10-29 07:28:36 -07:00
spi-ppc4xx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-pxa2xx-pci.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-pxa2xx.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.h
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.S
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-s3c24xx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-s3c64xx.c
spi/s3c64xx: Merge dma control code
2011-09-14 11:10:03 +05:30
spi-sh-msiof.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-sh-sci.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-sh.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-stmp.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-tegra.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-ti-ssp.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi-tle62x0.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-topcliff-pch.c
spi-topcliff-pch: Fix overrun issue
2011-10-04 10:10:50 -06:00
spi-txx9.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spi-xilinx.c
drivercore: Add helper macro for platform_driver boilerplate
2011-10-25 00:35:47 +02:00
spi.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00
spidev.c
spi: reorganize drivers
2011-06-06 01:16:30 -06:00