Merge tag 'drm-intel-fixes-2017-12-20' of git://anongit.freedesktop.org/drm/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 21 Dec 2017 01:09:36 +0000 (11:09 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 21 Dec 2017 01:09:36 +0000 (11:09 +1000)
drm/i915 fixes for v4.15-rc5

* tag 'drm-intel-fixes-2017-12-20' of git://anongit.freedesktop.org/drm/drm-intel:
  drm/i915: Protect DDI port to DPLL map from theoretical race.
  drm/i915/lpe: Remove double-encapsulation of info string


Trivial merge