dcded10f6d
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)
DMAENGINE: at_hdmac: locking fixlet
DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
dma: dmatest: fix potential sign bug
ioat2: catch and recover from broken vtd configurations v6
DMAENGINE: add runtime slave control to COH 901 318 v3
DMAENGINE: add runtime slave config to DMA40 v3
DMAENGINE: generic slave channel control v3
dmaengine: Driver for Topcliff PCH DMA controller
intel_mid: Add Mrst & Mfld DMA Drivers
drivers/dma: Eliminate a NULL pointer dereference
dma/timb_dma: compile warning on 32 bit
DMAENGINE: ste_dma40: support older silicon
DMAENGINE: ste_dma40: support disabling physical channels
DMAENGINE: ste_dma40: no disabled phy channels on ux500
DMAENGINE: ste_dma40: fix suspend bug
DMAENGINE: ste_dma40: add DB8500 memcpy channels
DMAENGINE: ste_dma40: no flow control on memcpy
DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
DMAENGINE: ste_dma40: allocate LCLA dynamically
DMAENGINE: ste_dma40: no premature stop
...
Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| board-mop500.c | ||
| board-u5500.c | ||
| clock.c | ||
| clock.h | ||
| cpu-db5500.c | ||
| cpu-db8500.c | ||
| cpu.c | ||
| devices-db5500.c | ||
| devices-db8500.c | ||
| devices.c | ||
| headsmp.S | ||
| localtimer.c | ||
| pins-db8500.h | ||
| platsmp.c | ||
| ste-dma40-db8500.h | ||