Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Wed, 21 Dec 2011 09:50:56 +0000 (09:50 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 21 Dec 2011 09:50:56 +0000 (09:50 +0000)
commit4cf73129cbe001b41be2f8b56f763fbf3acaa4ce
tree2cdde82f48800ae1746775bab7e4f3c5f1fc3b88
parent3e54f5b72b44a5b905dc56442b147b0ee0475a1d
parent6abff3c78051e40130a1c653f874fb12b9d40254
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
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c