Arnd Bergmann 511f1cb6d4 Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers ... The pxa regulator branch removes the bq24022 driver, while a lot of other regulator drivers got added in the regulator tree. This resolves the trivial conflicts by merging in the regulator patches that are already merged into v3.4. Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-24 11:29:58 +00:00
..
arm	ARM: dt: Add binding for Tegra PMC	2012-02-06 18:21:21 -08: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	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
hwmon
i2c	i2c: OMAP: Add DT support for i2c controller	2012-01-17 22:44:57 +00: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: twl-regulator: Add fixed LDO for V1V8, V2V1 supply	2012-03-11 20:09:18 +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
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	of: add picochip vendor prefix	2012-02-27 10:07:56 -06:00
xilinx.txt