tree f30b3539f1a259e22247efab51f5131ab73ec134
parent ba3b7d827e96e90e3df82695c96b3f9a666c0d82
parent 89ced125472b8551c65526934b7f6c733a6864fa
author Linus Torvalds <torvalds@linux-foundation.org> 1365962120 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1365962120 -0700

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.