mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-10 19:43:29 +00:00
fba9569924
* '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
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| bast-ide.c | ||
| bast-irq.c | ||
| cpu-freq.c | ||
| dma.c | ||
| h1940-bluetooth.c | ||
| Kconfig | ||
| mach-amlm5900.c | ||
| mach-bast.c | ||
| mach-h1940.c | ||
| mach-n30.c | ||
| mach-otom.c | ||
| mach-qt2410.c | ||
| mach-smdk2410.c | ||
| mach-tct_hammer.c | ||
| mach-vr1000.c | ||
| Makefile | ||
| Makefile.boot | ||
| nor-simtec.c | ||
| nor-simtec.h | ||
| pll.c | ||
| pm-h1940.S | ||
| pm.c | ||
| s3c2410.c | ||
| sleep.S | ||
| usb-simtec.c | ||
| usb-simtec.h | ||