]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 21:19:31 +0000 (13:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 21:19:31 +0000 (13:19 -0800)
commit5fa3577b1a1202972e6e419040438c29f39f59cc
treef148c5bfad584ba8ac79d43fd3e40a12d49d92af
parentd4220f987cf473c65a342ca69e3eb13dea919a49
parentfb1d9738ca053ea8afa5e86af6463155f983b01c
Merge branch 'drm-vmware-staging' of git://git./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
drivers/gpu/drm/Makefile
drivers/staging/Kconfig
include/drm/Kbuild