]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2856db80ab3ff6cabfe48239924a5143b004f0e6
tree6032a118853108b3659c1f6d5dd5eea549e9d077
parent10091620f3ad0e9163bd8c65b59a954191501b64
parentbf6941874480872b1884cf77dd8975d716c00c9d
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