Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Nov 2012 03:16:41 +0000 (04:16 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Nov 2012 03:16:41 +0000 (04:16 +0100)
commit69a8ebfa218f6573c937dc3d5101071e3d62af10
treef724d41254259abed131f23fbab2613bd0b8c211
parent3cc5a2ee7fc8f67abeb91f39fd553b5d2d55b775
parent695ddeb457584a602f2ba117d08ce37cf6ec1589
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