Merge tag 'drm-intel-fixes-2015-05-21' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 22 May 2015 03:31:03 +0000 (13:31 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 May 2015 03:31:03 +0000 (13:31 +1000)
There's a stable backport from Ander [1] that combines this and a few
other commits to fix the flickering on v4.0, reported in [2] among
others. Having this upstream is obviously a requirement for stable.

* tag 'drm-intel-fixes-2015-05-21' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: fix screen flickering


Trivial merge