diff options
author | 2013-04-03 06:41:15 +1000 | |
---|---|---|
committer | 2013-04-03 06:41:15 +1000 | |
commit | 1caa590075ddef41950c46123e80cd6a64505218 (patch) | |
tree | 4aebdcfe594e90ee2eaddac1d9eac2067c21445b /net/unix/af_unix.c | |
parent | ipc: set msg back to -EAGAIN if copy wasn't performed (diff) | |
parent | drm: don't unlock in the addfb error paths (diff) | |
download | wireguard-linux-1caa590075ddef41950c46123e80cd6a64505218.tar.xz wireguard-linux-1caa590075ddef41950c46123e80cd6a64505218.zip |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions