android_kernel_motorola_sm6225/Documentation/devicetree/bindings
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
..
arm arm-soc: virtualization changes 2013-02-21 15:40:16 -08:00
ata ARM: EXYNOS: DT Support for SATA and SATA PHY 2012-11-20 21:02:17 +09:00
bus ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND 2013-01-15 14:50:15 -08:00
c6x
clock arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
cpufreq cpufreq: SPEAr: Add CPUFreq driver 2012-11-27 14:05:26 +01:00
crypto crypto: caam - Added property fsl, sec-era in SEC4.0 device tree binding. 2013-02-13 07:49:01 -06:00
dma ARM: dts: pl330: Add #dma-cells for generic dma binding support 2013-02-14 20:04:27 +05:30
drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio devicetree: Move NS2 LEDs binding into LEDs directory 2013-02-07 12:23:15 +00:00
gpu drm: Add NVIDIA Tegra20 support 2012-11-20 15:43:41 +10:00
hwmon hwmon: Versatile Express hwmon driver 2012-10-16 17:12:35 +01:00
i2c hwmon: Driver for Texas Instruments INA209 2013-02-06 09:57:59 -08:00
input Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
interrupt-controller irqchip: sunxi: Add irq controller driver 2012-11-16 21:56:51 +01:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
leds devicetree: Move NS2 LEDs binding into LEDs directory 2013-02-07 12:23:15 +00:00
lpddr2 Documentation: dt: device tree bindings for LPDDR2 memories 2012-09-07 19:18:37 +02:00
media [media] media: rc: gpio-ir-recv: add support for device tree parsing 2013-02-13 17:40:23 -02:00
memory-controllers/ti Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller 2012-09-07 19:18:38 +02:00
mfd This is the MFD pull request for the 3.9 merge window. 2013-02-24 20:00:58 -08:00
mips/cavium documentation/devicetree: Fix typos 2013-02-06 11:06:36 +00:00
misc ARM: at91: atmel-ssc: add device tree support 2012-11-07 09:23:49 +01:00
mmc Merge branch 'for-next' from git://sources.calxeda.com/kernel/linux.git 2013-02-13 09:59:13 +00:00
mtd arm-soc: device tree conversions 2013-02-21 15:38:49 -08:00
net driver: net: ethernet: cpsw: dual emac interface implementation 2013-02-12 16:15:10 -05:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl arm-soc: non-critical bug fixes 2013-02-21 14:54:55 -08:00
power PM / OPP: Initialize OPP table from device tree 2012-09-09 22:06:33 +02:00
power_supply This is the MFD pull request for the 3.9 merge window. 2013-02-24 20:00:58 -08:00
powerpc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-02-23 17:09:55 -08:00
pwm pwm: New driver to support PWM driven LEDs on TWL4030/6030 series of PMICs 2012-11-28 15:16:19 +01:00
regulator This is the MFD pull request for the 3.9 merge window. 2013-02-24 20:00:58 -08:00
rtc documentation/devicetree: Fix typos 2013-02-06 11:06:36 +00:00
serial serial: tegra: add serial driver 2013-01-15 22:15:17 -08:00
serio
sound Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2013-02-11 11:06:53 +00:00
spi spi/sh-msiof: Add device tree parsing to driver 2013-02-05 12:26:58 +00:00
staging iio: mxs: Implement support for touchscreen 2013-01-26 10:07:46 +00:00
thermal Thermal: Add ST-Ericsson DB8500 thermal driver. 2012-11-15 20:50:34 +08:00
timer ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
tty/serial serial/arc-uart: Miscll DT related updates (Grant's review comments) 2013-02-13 08:37:49 -08:00
usb arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
video Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
virtio
w1 onewire: w1-gpio: add DT bindings 2012-08-16 10:00:23 -07:00
watchdog documentation/devicetree: Fix typos 2013-02-06 11:06:36 +00:00
x86
eeprom.txt
marvell.txt
open-pic.txt
resource-names.txt
vendor-prefixes.txt Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
xilinx.txt