Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits) ARM: mach-shmobile: specify CHCLR registers on SH7372 dma: shdma: fix runtime PM: clear channel buffers on reset dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit dmaengine/ste_dma40: clear LNK on channel startup dmaengine: intel_mid_dma: remove legacy pm interface ASoC: mxs: correct 'direction' of device_prep_dma_cyclic dmaengine: intel_mid_dma: error path fix dmaengine: intel_mid_dma: locking and freeing fixes mtd: gpmi-nand: move to dma_transfer_direction mtd: fix compile error for gpmi-nand mmc: mxs-mmc: fix the dma_transfer_direction migration dmaengine: add DMA_TRANS_NONE to dma_transfer_direction dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled. dma: mxs-dma: fix a typo in comment DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove video i.MX IPU: Fix display connections i.MX IPU DMA: Fix wrong burstsize settings dmaengine/ste_dma40: allow fixed physical channel ... Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c} The conflicts looked pretty trivial, but I'll ask people to verify them.		2012-01-17 18:40:24 -08:00
..
arm	Merge branch 'samsung/cleanup' into next/boards	2012-01-09 17:06:36 +00:00
ata	ahci: add DT binding for Calxeda AHCI controller	2011-11-03 15:52:38 -05:00
c6x	C6X: devicetree support	2011-10-06 19:47:33 -04:00
crypto	crypto: picoxcell - support for device tree matching	2011-08-10 19:00:26 +08:00
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
fb	Fix common misspellings	2011-03-31 11:26:23 -03:00
gpio	gpio/samsung: Add device tree support for EXYNOS4	2011-12-23 10:06:54 +09:00
hwmon	hwmon: (ads1015) Make gain and datarate configurable	2011-03-21 17:59:37 +01:00
i2c	i2c-designware: add OF binding support	2011-12-27 15:52:44 -06:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-01-10 10:55:52 -08:00
mfd	mfd: Improve mc13xxx dt binding document	2012-01-09 00:37:46 +01:00
mmc	mmc: sdhci-tegra: Add 8-bit support to device tree binding.	2011-10-26 15:43:42 -04:00
mtd	mtd: gpio-nand: add device tree bindings	2012-01-09 18:23:58 +00:00
net	Driver specific changes	2012-01-09 14:39:22 -08:00
nvec	staging: nvec: add device tree support	2011-11-26 17:17:14 -08:00
pci
pinmux	arm/dt: Tegra: Add pinmux node to tegra20.dtsi	2011-10-11 17:19:56 -07:00
power_supply	devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings	2012-01-06 05:25:53 +04:00
powerpc	powerpc/fsl: Document rapidio node binding-information	2011-11-24 02:01:34 -06:00
regulator	regulator: fix label names used in device tree bindings	2011-11-28 19:00:05 +00:00
rtc	drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030	2012-01-10 16:30:53 -08:00
serial	power management changes for omap and imx	2012-01-09 14:39:59 -08:00
serio
sound	mfd: Add basic device tree binding for wm8994	2012-01-09 00:37:30 +01:00
spi	devicetree: Add ARM pl022 spi controller binding doc	2011-10-05 07:39:56 -05:00
tty/serial	Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 21:02:35 -07:00
usb	arm/dt: add basic usb nodes to tegra device trees	2011-12-07 20:47:47 -08:00
virtio	virtio: Add platform bus driver for memory mapped virtio device	2011-11-02 11:41:01 +10:30
watchdog	watchdog: imx2_wdt: add device tree probe support	2011-07-26 21:19:16 +00:00
x86	x86: dt: Correct local apic documentation in device tree bindings	2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt	powerpc: Document the Open PIC device tree binding	2011-03-21 11:00:52 +11:00
resource-names.txt	of/irq: Add interrupts-names property to name an irq resource	2012-01-04 00:33:15 -07:00
vendor-prefixes.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
xilinx.txt