tree df2576135dd801e8088cded70b8707f547ee040b
parent aea7fab8bac68860f3eb2e8127f9ea698475c0c4
parent a8ec3a662921220fc058ed6f7f3674697876d218
author Linus Torvalds <torvalds@linux-foundation.org> 1364953944 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1364953944 -0700

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