From: Dave Airlie Date: Tue, 2 Apr 2013 20:41:15 +0000 (+1000) Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel... X-Git-Tag: v3.9-rc6~28^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1caa590075ddef41950c46123e80cd6a64505218;p=linux.git Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next One locking regression fix, and a couple of other i915 ones. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: 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 --- 1caa590075ddef41950c46123e80cd6a64505218