]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commited6e0b9779060a53532d75c85a58662d332061cb
tree6c60e924732351682959f911833e3434d78aa849
parentb62155a8512189a018ca5d6fe39d7405f4d48ea3
parentf5261a7d8a5ae5ac86065fdca6cc9bd2862bf4b3
Merge tag 'drm-for-v4.13' into drm-intel-next-queued

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>
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