From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Apr 2013 17:55:20 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.9-rc7~4
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=93263e5283d5c2bc447bc42956f4fa58a3a0a63a;p=~andy%2Flinux

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

Pull drm fixes from Dave Airlie:
 "One fix for a hotplug locking regressions, and one fix for an oops if
  you unplug the monitor at an inopportune moment on the udl device."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/fb-helper: Fix locking in drm_fb_helper_hotplug_event
  udl: handle EDID failure properly.
---

93263e5283d5c2bc447bc42956f4fa58a3a0a63a