Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 26 Mar 2020 14:11:04 +0000 (15:11 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 26 Mar 2020 14:11:04 +0000 (15:11 +0100)
commitc1b164a5f7ab932699923f58c95767bfc6921d91
treeb664c14d00f41eb1f51aaf61dabbececfcac8518
parent873863b6214a034e8d4e4bfc8232f65bf9a292fe
parentc2556238120bce8be37670e145226c12870a9e5a
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Requested for getting some i915 fixes back into drm-misc-next by danvet.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
MAINTAINERS
drivers/gpu/drm/etnaviv/etnaviv_drv.c
drivers/gpu/drm/i915/display/intel_display_debugfs.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/tegra/dc.c
drivers/gpu/drm/tegra/hdmi.c