]> git.baikalelectronics.ru Git - kernel.git/commit
Merge drm/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 10 Jul 2019 13:51:35 +0000 (06:51 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 10 Jul 2019 13:51:35 +0000 (06:51 -0700)
commit0b0c40087a559a0f99c4c0b36330132c7779e393
treeeb06c935cc3363a284382fce1f6721f3a862654e
parent0da2c5127ffee81f9949f197683e4a66590c9420
parentdfd1f3fc3bd7433c0d419b2b800b4d3cfa0d8192
Merge drm/drm-next into drm-intel-next-queued

Catch-up with 5.2. Specially to remove a drm-tip merge
fixup around intel_workarounds.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_sdvo.c
drivers/gpu/drm/i915/gt/intel_workarounds.c
drivers/gpu/drm/i915/i915_reg.h