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)
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


Trivial merge