Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine updates from Vinod Koul: "This is fairly big pull by my standards as I had missed last merge window. So we have the support for device tree for slave-dmaengine, large updates to dw_dmac driver from Andy for reusing on different architectures. Along with this we have fixes on bunch of the drivers" Fix up trivial conflicts, usually due to #include line movement next to each other. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits) Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" ARM: dts: pl330: Add #dma-cells for generic dma binding support DMA: PL330: Register the DMA controller with the generic DMA helpers DMA: PL330: Add xlate function DMA: PL330: Add new pl330 filter for DT case. dma: tegra20-apb-dma: remove unnecessary assignment edma: do not waste memory for dma_mask dma: coh901318: set residue only if dma is in progress dma: coh901318: avoid unbalanced locking dmaengine.h: remove redundant else keyword dma: of-dma: protect list write operation by spin_lock dmaengine: ste_dma40: do not remove descriptors for cyclic transfers dma: of-dma.c: fix memory leakage dw_dmac: apply default dma_mask if needed dmaengine: ioat - fix spare sparse complain dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING dw_dmac: add support for Lynxpoint DMA controllers dw_dmac: return proper residue value dw_dmac: fill individual length of descriptor ...		2013-02-26 09:24:48 -08:00
..
altera-stapl
c2port
carma
cb710	drivers/misc/cb710: add missing GENERIC_HARDIRQS dependency	2013-02-08 12:23:53 -08:00
eeprom
ibmasm
lis3lv02d
mei	mei: fix undefined wd symbols when MEI_ME is not set	2013-02-07 14:00:25 -08:00
sgi-gru	x86, uv, uv3: Check current gru hub support for SGI UV3	2013-02-11 17:18:19 -08:00
sgi-xp
ti-st	Char/Misc driver patches for 3.9-rc1	2013-02-21 13:57:13 -08:00
vmw_vmci	drivers, vmci: Fix build error	2013-01-25 12:22:46 -08:00
ad525x_dpot-i2c.c
ad525x_dpot-spi.c
ad525x_dpot.c
ad525x_dpot.h
apds990x.c
apds9802als.c
arm-charlcd.c
atmel_pwm.c
atmel_tclib.c
atmel-ssc.c	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
bh1770glc.c
bh1780gli.c
bmp085-i2c.c
bmp085-spi.c
bmp085.c
bmp085.h
cs5535-mfgpt.c
ds1682.c
enclosure.c
ep93xx_pwm.c
fsa9480.c
hmc6352.c
hpilo.c
hpilo.h
ics932s401.c
ioc4.c
isl29003.c
isl29020.c
Kconfig	Char/Misc driver patches for 3.9-rc1	2013-02-21 13:57:13 -08:00
kgdbts.c
lattice-ecp3-config.c	misc: lattice-ecp3-config.c: remove __dev* markings	2013-01-17 10:25:26 -08:00
lkdtm.c
Makefile	misc: Add Lattice ECP3 FPGA configuration via SPI	2013-01-17 10:25:03 -08:00
pch_phub.c
phantom.c
pti.c
spear13xx_pcie_gadget.c
ti_dac7512.c
tifm_7xx1.c
tifm_core.c
tsl2550.c
vmw_balloon.c