From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 Aug 2013 16:09:11 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.11-rc7~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbf21849edaf0cd2a9b33307ab965757a93b8d75;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Pull drm fixes from Dave Airlie:
 "Bit late with these, was under the weather for a a few days, nothing
  too crazy:

  Some radeon regression fixes, one intel regression fix, and one fix to
  avoid a warn with i915 when used with dma-buf"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: unpin backing storage in dmabuf_unmap
  drm/radeon: fix WREG32_OR macro setting bits in a register
  drm/radeon/r7xx: fix copy paste typo in golden register setup
  drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
  drm/radeon: fix UVD message buffer validation
---

fbf21849edaf0cd2a9b33307ab965757a93b8d75