Merge tag 'drm-for-v4.13' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000 (21:56 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000 (21:56 +0200)
Resync with the main drm-next pull request for 4.13. What we really
need is to fully resync with pending drm-misc, but that's not yet
possible due to the still ongoing merge window.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h

Simple merge
Simple merge
Simple merge
Simple merge