Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:21:18 +0000 (15:21 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:21:18 +0000 (15:21 +1000)
fix one gpu hang on resume.

* tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Avoid GPU hang when coming out of s3 or s4


Trivial merge