Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Thu, 17 Dec 2009 23:53:50 +0000 (09:53 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Dec 2009 23:53:50 +0000 (09:53 +1000)

Trivial merge