linux/Documentation/devicetree/bindings
Dave Airlie e8115e79aa Linux 3.18-rc7
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
2014-12-02 10:58:33 +10: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: use chipcommon node from DT for SoC GPIO chip 2014-09-30 13:17:14 -04: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: imx: Move imx-drm driver out of staging 2014-11-26 09:40:39 +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 drm/tegra: dsi: Add ganged mode support 2014-11-13 16:12:28 +01: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 net: smc91x: Fix gpios for device tree based booting 2014-10-31 15:54:18 -04:00
nvec
panel drm/panel: Add Sharp LQ101R1SX01 support 2014-11-13 13:56:19 +01: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/iio/adc drm: imx: Move imx-drm driver out of staging 2014-11-26 09:40:39 +10: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 video: Add ADV751[13] DT bindings documentation 2014-11-26 20:09:40 +02: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 Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
xilinx.txt