Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@gmail.com>
Thu, 20 Sep 2012 20:50:40 +0000 (06:50 +1000)
committerDave Airlie <airlied@gmail.com>
Thu, 20 Sep 2012 20:50:40 +0000 (06:50 +1000)
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


Trivial merge