]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit14456f86db04971be6a758ae9cad087f7c177eab
tree2cdde82f48800ae1746775bab7e4f3c5f1fc3b88
parent022eae471f1024b1bc86f318f68709cf02a37afd
parentc2c3ad25cd46e3edb1c8c703e40cb990d2f5cbba
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