From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Nov 2012 03:16:41 +0000 (+0100)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.7-rc5~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69a8ebfa218f6573c937dc3d5101071e3d62af10;p=platform%2Fkernel%2Flinux-3.10.git

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

Pull drm fixes from Dave Airlie:
 "A single radeon typo fix for a regressions and two fixes for a
  regression in the open helper address space stuff."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: fix typo in evergreen_mc_resume()
  drm: set dev_mapping before calling drm_open_helper
  drm: restore open_count if drm_setup fails
---

69a8ebfa218f6573c937dc3d5101071e3d62af10