Daniel Vetter 0f9e9cd61f Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next ...

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2015-03-20 11:44:34 +01:00

..

acpi

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2015-02-19 11:28:36 -08:00

asm-generic

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-02-18 09:24:01 -08:00

clocksource

time: move the timecounter/cyclecounter code into its own file.

2014-12-30 18:29:25 -05:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2015-02-14 09:47:01 -08:00

drm

drm/i915: remove indirection in the PCI ID macros

2015-03-17 22:30:21 +01:00

dt-bindings

ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding

2015-03-06 09:21:03 -08:00

keys

…

kvm

arm/arm64: KVM: allow userland to request a virtual GICv3

2015-01-20 18:25:33 +01:00

linux

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2015-03-15 15:07:08 -07:00

math-emu

…

media

[media] tea575x: split and export functions

2015-01-27 10:13:50 -02:00

memory

…

misc

…

net

netfilter: nf_tables: fix userdata length overflow

2015-03-04 18:46:06 +01:00

pcmcia

…

ras

…

rdma

Revert "IB/core: Add support for extended query device caps"

2015-02-06 00:54:33 -08:00

rxrpc

…

scsi

Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block

2015-02-12 14:13:23 -08:00

soc

pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.

2015-03-03 19:43:59 +01:00

sound

ALSA: pcm: allow for trigger_tstamp snapshot in .trigger

2015-02-09 16:01:53 +01:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-02-21 13:21:19 -08:00

trace

Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-17 16:12:34 -08:00

uapi

drm/i915: Export total subslice and EU counts

2015-03-17 22:30:31 +01:00

video

OMAPDSS: fix regression with display sysfs files

2015-02-26 10:23:15 +02:00

xen

xen: Remove trailing semicolon from xenbus_register_frontend() definition

2015-03-02 10:38:59 +00:00

Kbuild

…