git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 63d4ec8 afcc87a)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 20:35:51 +0000 (21:35 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 20:35:51 +0000 (21:35 +0100)
commita1c2d60889d633ffecfa9f1f7ac0bdb474b7484e
treed073eb68dc1d2360376f72f483d0f78bf66a1b72tree
parent63d4ec8731865b228065e212f01661023f85b972commit | diff
parentafcc87aa6a233e52df73552dc1dc9ae3881b7cc8commit | diff
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes (again) from Dave Airlie:
 "dropped the ball on a vmware patch, so two more fixes for vmwgfx are
  here, one for hibernate issue, one for a BUG trigger."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
  drm/vmwgfx: Fix hibernation device reset
Unnamed repository; edit this file 'description' to name the repository.