Merge tag 'drm-intel-fixes-2016-06-22' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:32:30 +0000 (10:32 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:32:30 +0000 (10:32 +1000)
 Hi Dave, just a couple of display fixes, both stable stuff. Maybe we'll
be able to enable fbc by default one day.

* tag 'drm-intel-fixes-2016-06-22' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/fbc: Disable on HSW by default for now
  drm/i915: Revert DisplayPort fast link training feature


Trivial merge