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)
commit4adda532c05fa74602408cea319dcace884f7c67
tree4b48b611e1b49981428b73ee7267c61c92d2dd65
parent22f880ca8246c6c80c4f48731c6a7d5d15042f56
parente5c1ff14757afe21733ddee9cc4bbaeaeadbf803
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

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>
drivers/gpu/drm/i915/i915_irq.c