From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Apr 2013 01:52:24 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.9-rc6~28
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd709bd027a394bce911a0cd60ee9cbdde49361b;p=~emulex%2Finfiniband.git

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

Pull DRM fixes from Dave Airlie:
 "Two core fixes, both regressions, along with some intel and some
  nouveau fixes for regressions and oopses"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: correctly restore mappings if drm_open fails
  drm/nouveau: fix NULL ptr dereference from nv50_disp_intr()
  drm/nouveau: fix handling empty channel list in ioctl's
  drm: don't unlock in the addfb error paths
  drm/i915: Fix build failure
  drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)
  drm/i915: duct-tape locking when eDP init fails
---

bd709bd027a394bce911a0cd60ee9cbdde49361b