tree 6a2ee3eac1a370bdc776eab0eca60750612533a3
parent 18d4dbd8866a34507d52495207ef5fcec6d41049
parent 16c58081eb95e35f284421176f355eccfc773bbe
author Dave Airlie <airlied@gmail.com> 1348174240 +1000
committer Dave Airlie <airlied@gmail.com> 1348174240 +1000

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