mirror-linux/Documentation/devicetree/bindings
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
arc
arm ARM: SoC platform changes for 3.12 2013-09-06 13:30:06 -07:00
ata
bus
c6x
clock The common clk framework changes for 3.12 are dominated by clock driver 2013-09-09 15:49:04 -07:00
cpufreq
crypto
dma Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2013-09-10 13:37:36 -07:00
drm/tilcdc
extcon
fb
gpio This is the bulk of GPIO changes for the v3.12 series: 2013-09-07 10:53:00 -07:00
gpu The common clk framework changes for 3.12 are dominated by clock driver 2013-09-09 15:49:04 -07:00
hid
hwmon
hwrng
i2c
iio
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2013-09-07 10:38:46 -07:00
interrupt-controller
iommu
leds
lpddr2
media ARM: SoC DT updates for 3.12 2013-09-06 13:26:27 -07:00
memory-controllers
metag
mfd For the 3.12 merge window we have one new driver for the DA9063 PMIC 2013-09-07 20:14:19 -07:00
mips
misc ARM: SoC DT updates for 3.12 2013-09-06 13:26:27 -07:00
mmc ARM: SoC fixes for 3.12-rc 2013-10-02 21:48:32 -07:00
mtd
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-01 17:06:14 -04:00
nvec
pci dts: Fix misspelling of Synopsys 2013-09-24 21:13:38 -05:00
pinctrl ARM: SoC DT updates for 3.12 2013-09-06 13:26:27 -07:00
power
power_supply
powerpc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-09-06 10:49:42 -07:00
pps
pwm The common clk framework changes for 3.12 are dominated by clock driver 2013-09-09 15:49:04 -07:00
regulator For the 3.12 merge window we have one new driver for the DA9063 PMIC 2013-09-07 20:14:19 -07:00
reset
rng
rtc drivers/rtc/rtc-palmas.c: support for backup battery charging 2013-09-11 15:58:55 -07:00
serial tty: ar933x_uart: move devicetree binding documentation 2013-09-26 12:33:49 -07:00
serio dts: Deprecate ALTR as a vendor prefix 2013-08-29 12:58:55 -07:00
sound ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver 2013-09-06 10:29:58 +01:00
spi ARM: SoC DT updates for 3.12 2013-09-06 13:26:27 -07:00
staging
thermal
timer clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding 2013-09-02 21:44:58 +02:00
ufs
usb Char/Misc patches for 3.12-rc1 2013-09-03 11:36:27 -07:00
video
virtio
w1
watchdog
x86
eeprom.txt
marvell.txt
open-pic.txt
resource-names.txt
vendor-prefixes.txt This is the bulk of GPIO changes for the v3.12 series: 2013-09-07 10:53:00 -07:00
xilinx.txt