OpenCloudOS-Kernel/Documentation/devicetree/bindings
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
arc
arm ACPI and power management updates for 3.18-rc1 2014-10-09 16:07:43 -04:00
ata ata: sata_rcar: Add r8a7793 device support 2014-10-27 23:50:36 -04:00
bus bcma: get IRQ numbers from dt 2014-11-11 16:31:11 -05:00
c6x
clock The clk tree changes for 3.18 are dominated by clock drivers. Mostly 2014-10-15 07:05:03 +02:00
cpufreq cpufreq: cpu0: rename driver and internals to 'cpufreq_dt' 2014-10-03 15:37:54 +02:00
crypto Documentation: treewide: fix typos and grammar 2014-08-26 09:35:51 +02:00
dma Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2014-10-18 18:11:04 -07:00
drm drm/tilcdc: panel: Add support for enable GPIO 2014-09-17 10:55:27 +10:00
extcon dt-bindings: extcon: Add support for Richtek RT8973A MUIC device 2014-09-22 11:43:08 +09:00
fb
fuse soc/tegra: Add efuse and apbmisc bindings 2014-07-17 14:36:10 +02:00
gpio power supply and reset changes for the v3.18 series 2014-10-15 06:56:23 +02:00
gpu ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
hid
hsi
hwmon hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor. 2014-09-22 11:14:52 -07:00
hwrng
i2c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2014-10-19 12:50:44 -07:00
iio Staging patches for 3.18-rc1 2014-10-08 06:50:18 -04:00
input Merge branch 'next' into for-linus 2014-10-03 11:24:46 -07:00
interrupt-controller of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text 2014-11-18 11:34:35 -06:00
iommu iommu/arm-smmu: support MMU-401 2014-09-16 19:15:23 +01:00
leds leds: add device tree bindings for register bit LEDs 2014-09-26 00:27:19 +02:00
lpddr2
mailbox Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration 2014-10-21 11:21:19 -07:00
media [media] rc: Add DT bindings for hix5hd2 2014-09-23 16:13:51 -03:00
memory-controllers Documentation: devicetree: Add binding for Synopsys DDR controller 2014-09-16 12:55:05 +02:00
metag
mfd Changes to existing drivers: 2014-10-15 06:58:16 +02:00
mipi
mips
misc soc/tegra: Add efuse and apbmisc bindings 2014-07-17 14:36:10 +02:00
mmc mmc: tmio-mmc: Add support for SDHI on new R-Car Gen2 SoCs 2014-09-09 13:59:19 +02:00
mtd MTD updates for 3.18 2014-10-18 11:48:03 -07:00
net dt/bindings: add clock-select function property to micrel phy binding 2014-11-21 14:08:57 -05:00
nvec
panel drm/panel/simple: add optronics B101XTN01.0 (v3) 2014-09-10 11:19:07 -04:00
pci PCI: Add missing DT binding for "linux,pci-domain" property 2014-11-13 15:43:41 -07:00
phy USB patches for 3.18-rc1 2014-10-08 06:47:31 -04:00
pinctrl documentation: pinctrl bindings: Fix trivial typo 'abitrary' 2014-11-18 12:01:52 -06:00
power power supply and reset changes for the v3.18 series 2014-10-15 06:56:23 +02:00
power_supply Documentation: treewide: fix typos and grammar 2014-08-26 09:35:51 +02:00
powerpc powerpc/85xx: Add binding for CPLD 2014-07-31 00:10:45 -05:00
pps
pwm pwm: rockchip: Allow polarity invert on rk3288 2014-08-26 10:44:08 +02:00
regmap regmap: Add the DT binding documentation for endianness 2014-08-16 16:56:23 -05:00
regulator ARM: SoC DT updates for 3.18 2014-10-08 17:22:23 -04:00
reserved-memory
reset ARM: SoC driver changes 2014-06-02 16:35:49 -07:00
rng Documentation: rng: Add X-Gene SoC RNG driver documentation 2014-08-29 21:46:40 +08:00
rtc Documentation: dt-bindings: trickle charger dt binding document for ds1339 2014-10-14 02:18:18 +02:00
serial DTS: serial: Add bindings documention for the Mediatek UARTs 2014-09-10 06:59:41 -07:00
serio
soc Documentation: dt: soc: add Keystone Navigator DMA bindings 2014-09-24 09:49:15 -04:00
sound Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl', 'asoc/fix/intel', 'asoc/fix/s6000' and 'asoc/fix/sgtl5000' into asoc-linus 2014-10-27 11:17:41 +00:00
spi Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof' and 'spi/topic/sirf' into spi-next 2014-10-03 16:33:42 +01:00
spmi
staging Staging patches for 3.18-rc1 2014-10-08 06:50:18 -04:00
thermal thermal: rcar: Add binding docs for new R-Car Gen2 SoCs 2014-11-02 23:02:49 -04:00
timer Renesas Clocksource Updates for v3.18 2014-09-29 01:59:51 +02:00
ufs ufs: Add freq-table-hz property for UFS device 2014-10-01 13:11:25 +02:00
usb usb3503: fix typos in devicetree binding documentation 2014-09-23 22:15:18 -07:00
video fbdev changes for 3.18 2014-10-18 18:03:02 -07:00
virtio
w1
watchdog ARM: docs: add documentation binding for meson watchdog 2014-10-20 20:57:13 +02:00
x86
xillybus xillybus: Move out of staging 2014-09-23 23:44:16 -07:00
ABI.txt
eeprom.txt
graph.txt
marvell.txt
open-pic.txt
resource-names.txt
submitting-patches.txt Documentation: dt-bindings: Explain order in patch series 2014-10-21 10:31:27 -04:00
vendor-prefixes.txt devicetree: bindings: Add vendor prefix for Micron Technology, Inc. 2014-11-18 11:51:35 -06:00
xilinx.txt