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

..

agp

agp/intel-gtt: Remove get/put_pages

2014-09-19 14:43:11 +02:00

hw_random

hwrng: pseries - port to new read API and fix stack corruption

2014-11-06 23:10:22 +08:00

ipmi

ipmi: Clear drvdata when interface is removed

2014-10-07 13:22:32 -04:00

mwave

…

pcmcia

…

tpm

xen: remove DEFINE_XENBUS_DRIVER() macro

2014-10-06 10:27:57 +01:00

xilinx_hwicap

char: xilinx_hwicap: Remove .owner field for driver

2014-09-23 23:13:13 -07:00

xillybus

xillybus: Move out of staging

2014-09-23 23:44:16 -07:00

apm-emulation.c

…

applicom.c

…

applicom.h

…

bfin-otp.c

…

bsr.c

…

ds1302.c

…

ds1620.c

…

dsp56k.c

…

dtlk.c

…

efirtc.c

…

generic_nvram.c

…

genrtc.c

…

hangcheck-timer.c

…

hpet.c

…

i8k.c

i8k: Add support for Dell Latitude E6540

2014-09-23 23:26:42 -07:00

Kconfig

xillybus: Move out of staging

2014-09-23 23:44:16 -07:00

lp.c

…

Makefile

xillybus: Move out of staging

2014-09-23 23:44:16 -07:00

mbcs.c

…

mbcs.h

…

mem.c

switch /dev/zero and /dev/full to ->read_iter()

2014-10-09 02:39:08 -04:00

misc.c

…

mmtimer.c

…

msm_smd_pkt.c

…

mspec.c

…

nsc_gpio.c

…

nvram.c

…

nwbutton.c

…

nwbutton.h

…

nwflash.c

…

pc8736x_gpio.c

…

ppdev.c

…

ps3flash.c

…

random.c

Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random

2014-10-24 12:33:32 -07:00

raw.c

Return short read or 0 at end of a raw device, not EIO

2014-10-31 06:33:26 -04:00

rtc.c

…

scx200_gpio.c

…

snsc_event.c

…

snsc.c

…

snsc.h

…

sonypi.c

…

tb0219.c

…

tile-srom.c

char: tile-srom: Add real platform bus parent

2014-10-02 10:19:34 -04:00

tlclk.c

…

toshiba.c

…

ttyprintk.c

…

uv_mmtimer.c

…

virtio_console.c

virtio_console: move early VQ enablement

2014-11-13 09:53:26 +02:00