From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 May 2015 05:21:18 +0000 (+1000)
Subject: Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: android-x86-6.0-r1~1414^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=472313245645661c3bc710f874e660c493d313e1;p=android-x86%2Fkernel.git

Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel into drm-fixes

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
---

472313245645661c3bc710f874e660c493d313e1