From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Nov 2012 20:35:51 +0000 (+0100)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.7-rc5~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e;p=pandora-kernel.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
Reading git-diff-tree failed