commit | 8e910d08a2fd61e3c0baf82042c6f0e0a9773df4 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@gmail.com> | Fri Sep 21 06:50:40 2012 +1000 |
committer | Dave Airlie <airlied@gmail.com> | Fri Sep 21 06:50:40 2012 +1000 |
tree | 6a2ee3eac1a370bdc776eab0eca60750612533a3 | |
parent | 18d4dbd8866a34507d52495207ef5fcec6d41049 [diff] | |
parent | 16c58081eb95e35f284421176f355eccfc773bbe [diff] |
Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes fixes a resume regression on pre-r6xx asics. * 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: Prevent leak of scratch register on resume from suspend