Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
arm	Merge branch 'depends/rmk/for-linus' into samsung/dt	2012-01-07 12:42:17 +00:00
ata	ahci: add DT binding for Calxeda AHCI controller	2011-11-03 15:52:38 -05:00
crypto	crypto: picoxcell - support for device tree matching	2011-08-10 19:00:26 +08:00
dma	DMA: PL330: Add device tree support	2011-12-23 10:07:04 +09: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	Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/tegra-iomem' into for-linus/i2c-3.2	2011-11-01 00:54:17 +00:00
input	input: samsung-keypad: Add device tree support	2011-12-23 10:07:10 +09:00
mmc	mmc: sdhci-tegra: Add 8-bit support to device tree binding.	2011-10-26 15:43:42 -04:00
mtd	mtd: dataflash: add device tree probe support	2011-09-11 15:02:15 +03:00
net	net/macb: add DT support for Cadence macb/gem driver	2011-12-16 13:11:00 +01:00
pci
pinmux	arm/dt: Tegra: Add pinmux node to tegra20.dtsi	2011-10-11 17:19:56 -07:00
powerpc	powerpc/fsl_msi: add support for "msi-address-64" property	2011-10-14 02:54:29 -05:00
rtc	rtc: rtc-s3c: Add device tree support	2011-12-23 10:07:10 +09:00
serial	serial: samsung: add device tree support	2011-12-23 10:07:01 +09:00
serio
sound	ASoC: Add device tree binding for WM8804	2011-08-31 09:52:57 +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
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
vendor-prefixes.txt	of: Add Silicon Image vendor prefix	2011-11-29 08:24:20 -06:00
xilinx.txt