Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock ... Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 17:31:45 +02:00
..
arm	SPEAr: Add DT bindings for SPEAr's timer	2012-05-12 21:03:26 +02: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	ARM: dt: tegra: Add Tegra APB DMA device tree binding	2012-02-06 18:21:20 -08:00
fb
gpio	GPIO changes for v3.4	2012-03-28 14:08:46 -07:00
hwmon
i2c	ARM: device tree work	2012-03-27 16:47:35 -07:00
input	Input: tegra-kbc - revise device tree support	2012-03-13 21:37:07 -07:00
mfd	mfd: Improve mc13xxx dt binding document	2012-01-09 00:37:46 +01:00
mmc	mmc: omap_hsmmc: Convert hsmmc driver to use device tree	2012-03-27 12:20:09 -04:00
mtd	ARM: at91/NAND DT bindings: add comments	2012-04-04 18:35:42 +02:00
net	stmmac: Add device-tree support	2012-03-16 22:48:53 -07:00
nvec	staging: nvec: add device tree support	2011-11-26 17:17:14 -08:00
pci
pinctrl	Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl	2012-05-12 20:38:42 +02:00
power_supply	max17042_battery: Make it possible to instantiate driver from DT	2012-03-26 20:40:51 +04:00
powerpc	powerpc: document the FSL MPIC message register binding	2012-03-16 16:15:28 -05:00
regulator	regulator: anatop: patching to device-tree property "reg".	2012-03-28 11:52:10 +01:00
rtc	Document: devicetree: add OF documents for arch-mmp	2012-03-07 09:32:52 +08:00
serial	Document: devicetree: add OF documents for arch-mmp	2012-03-07 09:32:52 +08:00
serio
sound	ASoC: fsl: add dt support for imx-audmux	2012-03-06 12:44:21 +00:00
spi	spi/omap: Add DT support to McSPI driver	2012-02-15 12:57:00 -07:00
tty/serial	serial/efm32: add new driver	2012-01-26 11:29:47 -08:00
usb	Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2	2012-03-19 20:57:28 +00: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
eeprom.txt
marvell.txt
open-pic.txt
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	Updates of sound stuff for 3.4-rc1	2012-03-22 13:00:13 -07:00
xilinx.txt