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)
commitcbc8cc049aefd571ebc3c255dc3e265f736751c0
tree46626ce409b71790af6220ee0518be694693af99
parent5012f5063f41ca01240e5983c3b2cceb9aafc7a4
parentfb1d9738ca053ea8afa5e86af6463155f983b01c
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
drivers/gpu/drm/Makefile
drivers/staging/Kconfig
include/drm/Kbuild