Dave Airlie e8115e79aa 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

Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

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

Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux

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

…

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

…

fb

…

fuse

…

gpio

Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

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

…

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

Merge tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

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

…

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

…

memory-controllers

…

metag

…

mfd

Merge tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2014-10-15 06:58:16 +02:00

mipi

…

mips

…

misc

…

mmc

…

mtd

Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd

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

Merge tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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

Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

2014-10-15 06:56:23 +02:00

power_supply

…

powerpc

…

pps

…

pwm

…

regmap

…

regulator

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-10-08 17:22:23 -04:00

reserved-memory

…

reset

…

rng

…

rtc

Documentation: dt-bindings: trickle charger dt binding document for ds1339

2014-10-14 02:18:18 +02:00

serial

…

serio

…

soc

…

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

Merge tag 'renesas-clocksource-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into clockevents/3.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

…

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

…

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

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

2014-12-02 10:58:33 +10:00

xilinx.txt

…