Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 20 Jun 2013 22:52:19 +0000 (08:52 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Jun 2013 22:52:19 +0000 (08:52 +1000)
commit9aa36876ddeb85dfb0bcf37be06bbdc62e954f16
tree5162ac17fb8814935f81d4f90c700f1e708138f6
parent784a4d5539eaff3316933f8f3dc2fdad5a9b9f4d
parent8444d5c69549aa0f0b574cc608742d4669e1cc01
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

One user visible fix to stop misreport GPU hangs and subsequent resets.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: update lockup tracking when scheduling in empty ring