diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 18:52:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 18:52:24 -0700 |
| commit | bd709bd027a394bce911a0cd60ee9cbdde49361b (patch) | |
| tree | df2576135dd801e8088cded70b8707f547ee040b /net/unix/af_unix.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | drm: correctly restore mappings if drm_open fails (diff) | |
| download | wireguard-linux-bd709bd027a394bce911a0cd60ee9cbdde49361b.tar.xz wireguard-linux-bd709bd027a394bce911a0cd60ee9cbdde49361b.zip | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions