openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/Documentation/devicetree/bindings
History
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2014-02-19 01:24:22 -05:00
..
arc ARC: Add documentation on DT binding for ARC700 PMU 2013-11-12 09:45:56 +05:30
arm ARM: SoC late changes for v3.14 2014-01-30 18:08:27 -08:00
ata ata: sata_mv: introduce compatible string "marvell, armada-370-sata" 2014-01-15 07:44:02 -05:00
bus This is a patch series that updates imx-weim bus driver to have it 2013-08-23 11:37:18 -07:00
c6x Documentation/devicetree/bindings/c6x/ fix a typo 2013-08-20 12:41:25 +02:00
clock ARM: SoC late changes for v3.14 2014-01-30 18:08:27 -08:00
cpufreq cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties 2013-12-04 09:34:24 -04:00
crypto ARM: driver updates for 3.14 2014-01-23 18:49:36 -08:00
dma Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2014-01-29 20:27:23 -08:00
drm/tilcdc
…
extcon extcon: palmas: Added a new compatible type *ti,palmas-usb-vid* 2014-01-07 11:54:27 +09:00
fb
…
gpio ARM: driver updates for 3.14 2014-01-23 18:49:36 -08:00
gpu drm/tegra: Obtain head number from DT 2014-01-23 15:51:32 +01:00
hid HID: i2c-hid: add DT bindings 2013-07-31 12:10:31 +02:00
hwmon Documentation: dt: hwmon: Add OF document for LM90 2013-11-15 10:40:39 +01:00
hwrng ARM: dts: AM33xx: Add RNG node 2013-10-29 13:58:51 -07:00
i2c ARM: driver updates for 3.14 2014-01-23 18:49:36 -08:00
iio iio: Add new driver dht11 2013-12-03 20:22:30 +00:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2014-01-24 17:17:30 -08:00
interrupt-controller Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-02-05 16:02:53 -08:00
iommu
…
leds LEDS: tca6507: add device-tree support for GPIO configuration. 2014-01-27 17:28:46 -08:00
lpddr2
…
media [media] Add DT binding documentation for Samsung S5K5BAF camera sensor 2013-12-21 06:53:12 -02:00
memory-controllers
…
metag irq-imgpdc: add ImgTec PDC irqchip driver 2013-08-21 14:17:56 +01:00
mfd regulator: Updates for v3.14 2014-01-25 13:19:10 -08:00
mipi gpu: host1x: Add MIPI pad calibration DT bindings 2013-12-17 18:10:08 +01:00
mips
…
misc drivers/misc: atmel-ssc: document clock properties 2013-12-18 16:39:54 -08:00
mmc mmc: atmel-mci: document clock properties 2014-02-07 17:20:38 +01:00
mtd mtd: nand: davinci: reuse driver for Keystone arch 2014-01-03 11:22:26 -08:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-02-19 01:24:22 -05:00
nvec ARM: tegra: document reset properties in DT bindings 2013-12-11 16:42:13 -07:00
panel drm/panel: Add support for Chunghwa CLAA101WA01A panel 2014-01-08 16:13:57 +01:00
pci ARM: SoC cleanups for 3.14 2014-01-23 18:36:55 -08:00
phy phy: add Broadcom Kona USB2 PHY DT binding 2013-12-23 14:32:23 -06:00
pinctrl pinctrl: Add pinctrl binding for Broadcom Capri SoCs 2014-01-16 14:25:38 +01:00
power dt: binding documentation for bq2415x charger 2014-01-25 15:24:15 +04:00
power_supply charger-manager: Support deivce tree in charger manager driver 2013-12-23 17:10:07 -08:00
powerpc dt/bindings: remove device_type "network" references 2014-01-16 16:26:19 +00:00
pps
…
pwm pwm: Changes for v3.14-rc1 2014-01-27 08:15:51 -08:00
regulator Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona' and 'regulator/topic/as3722' into regulator-linus 2014-01-23 12:01:24 +00:00
reset
…
rng ARM: DT: msm: Add Qualcomm's PRNG driver binding document 2013-10-30 12:02:55 +08:00
rtc Merge branch 'akpm' (incoming from Andrew) 2014-01-23 19:11:50 -08:00
serial DeviceTree updates for 3.14: 2014-01-24 17:27:34 -08:00
serio dts: Deprecate ALTR as a vendor prefix 2013-08-29 12:58:55 -07:00
sound sound fixes for 3.14-rc1 2014-01-31 15:38:09 -08:00
spi spi/atmel: document clock properties 2014-02-07 17:20:39 +01:00
staging usb: dwc2: move device tree bindings doc to correct place 2014-01-13 15:52:27 -08:00
thermal Merge branches 'misc' and 'soc' of .git into next 2014-01-03 22:55:04 +08:00
timer ARM: SoC DT updates for 3.14 2014-01-23 18:45:38 -08:00
ufs
…
usb ARM: SoC DT updates for 3.14 2014-01-23 18:45:38 -08:00
video powerpc/85xx: Add TWR-P1025 board support 2014-01-07 19:09:29 -06:00
virtio
…
w1
…
watchdog watchdog: at91sam9_wdt: update device tree doc 2014-01-28 21:29:08 +01:00
x86
…
ABI.txt dt/bindings: submitting patches and ABI documents 2014-01-20 22:31:06 +00:00
eeprom.txt
…
marvell.txt dt/bindings: Remove device_type "serial" from marvell,mv64360-mpsc 2014-01-16 16:31:31 +00:00
open-pic.txt
…
resource-names.txt
…
submitting-patches.txt dt/bindings: submitting patches and ABI documents 2014-01-20 22:31:06 +00:00
vendor-prefixes.txt DT: Add vendor prefix for Spansion Inc. 2014-02-05 10:39:17 -06:00
xilinx.txt
…