Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 11 May 2018 16:08:10 +0000 (18:08 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 11 May 2018 16:08:10 +0000 (18:08 +0200)
commit94cc2fde365fb4484080ea6675bb1e0c933f8002
treea249c6f6b12ff2dbe39d78bfb050e9c28619bee9
parent900aa8ad21587e909603f471b6cd81fd5338ec45
parent8eb008c80841e3410ef2c043093478ea36bb5ff1
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
MAINTAINERS
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/Kconfig.debug
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_sprite.c
drivers/gpu/drm/qxl/qxl_cmd.c
drivers/gpu/drm/qxl/qxl_drv.h
include/drm/drm_dp_helper.h