tree d073eb68dc1d2360376f72f483d0f78bf66a1b72
parent 63d4ec8731865b228065e212f01661023f85b972
parent afcc87aa6a233e52df73552dc1dc9ae3881b7cc8
author Linus Torvalds <torvalds@linux-foundation.org> 1352493351 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> 1352493351 +0100

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