| commit | bd709bd027a394bce911a0cd60ee9cbdde49361b | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 3 Apr 2013 01:52:24 +0000 (2 18:52 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 3 Apr 2013 01:52:24 +0000 (2 18:52 -0700) | ||
| tree | df2576135dd801e8088cded70b8707f547ee040b | treesnapshot (tar.gz zip) |
| parent | aea7fab8bac68860f3eb2e8127f9ea698475c0c4 | commitdiff |
| parent | a8ec3a662921220fc058ed6f7f3674697876d218 | commitdiff |
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
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