Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 11 Mar 2016 20:53:30 +0000 (06:53 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 11 Mar 2016 20:53:30 +0000 (06:53 +1000)
Two i915 regression fixes.

* tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Actually retry with bit-banging after GMBUS timeout
  drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW


Trivial merge