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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc drivers/gpu/drm/tegra/hdmi.c
Simple merge