aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-09 21:35:51 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-09 21:35:51 +0100
commita1c2d60889d633ffecfa9f1f7ac0bdb474b7484e (patch)
treed073eb68dc1d2360376f72f483d0f78bf66a1b72 /arch
parent63d4ec8731865b228065e212f01661023f85b972 (diff)
parentafcc87aa6a233e52df73552dc1dc9ae3881b7cc8 (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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions