From: Linus Torvalds Date: Fri, 9 Nov 2012 20:35:51 +0000 (+0100) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e;p=linux-edison.git 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 --- a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e