From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jun 2013 16:33:06 +0000 (-1000)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.10-rc7~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e61cd5e2e36746e5a4e791b9232aed39bce52ded;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm radeon fixes from Dave Airlie:
 "One core fix, but mostly radeon fixes for s/r and big endian UVD
  support, and a fix to stop the GPU being reset for no good reason, and
  crashing people's machines."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: update lockup tracking when scheduling in empty ring
  drm/prime: Honor requested file flags when exporting a buffer
  drm/radeon: fix UVD on big endian
  drm/radeon: fix write back suspend regression with uvd v2
  drm/radeon: do not try to uselessly update virtual memory pagetable
---

e61cd5e2e36746e5a4e791b9232aed39bce52ded