Merge drm/drm-next into drm-intel-next-queued
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 27 Mar 2019 16:23:53 +0000 (18:23 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 27 Mar 2019 16:23:53 +0000 (18:23 +0200)
commit0e2f54f88b8b9bbdb3a73b6e67cffb402187c73f
tree6032a118853108b3659c1f6d5dd5eea549e9d077
parent96fd2c6633b0484b030eb15e646ad50426c41e6a
parent0bec6219e5a0cf2dd17716949a7592807e10f3d7
Merge drm/drm-next into drm-intel-next-queued

This is needed to get the fourcc code merged without conflicts.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_pmu.c
drivers/gpu/drm/i915/i915_utils.h
drivers/gpu/drm/i915/intel_connector.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_sprite.c
include/sound/hdaudio.h