| commit | 472313245645661c3bc710f874e660c493d313e1 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri May 15 15:21:18 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri May 15 15:21:18 2015 +1000 |
| tree | 0e6ac1f69b83c32cd8505d9863801dba7c4cea3f | |
| parent | e52f649e5b7ad61edfe2b7273831fa3b64c76149 [diff] | |
| parent | 364aece01a2dd748fc36a1e8bf52ef639b0857bd [diff] |
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