aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 16:19:31 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 16:19:31 -0500
commit5fa3577b1a1202972e6e419040438c29f39f59cc (patch)
treef148c5bfad584ba8ac79d43fd3e40a12d49d92af /arch
parentd4220f987cf473c65a342ca69e3eb13dea919a49 (diff)
parentfb1d9738ca053ea8afa5e86af6463155f983b01c (diff)
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/vmwgfx: Add DRM driver for VMware Virtual GPU drm/vmwgfx: Add svga headers for vmwgfx driver drm/ttm: Add more driver type enums
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions