Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Mar 2017 08:02:45 +0000 (10:02 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Mar 2017 08:02:45 +0000 (10:02 +0200)
Backmerge drm-next to get at -rc4, which we need to land the 4.12 gvt
patches.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
drivers/gpu/drm/i915/i915_irq.c

Simple merge