From: Dave Airlie <airlied@redhat.com>
Date: Wed, 21 Dec 2011 09:50:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
X-Git-Tag: v3.3-rc1~121^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf73129cbe001b41be2f8b56f763fbf3acaa4ce;p=pandora-kernel.git

Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next

-next reported a messy merge, so I've merged my upstream pull into
my -next tree.

Conflicts:
	drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
---

4cf73129cbe001b41be2f8b56f763fbf3acaa4ce
Reading git-diff-tree failed