tree f148c5bfad584ba8ac79d43fd3e40a12d49d92af
parent d4220f987cf473c65a342ca69e3eb13dea919a49
parent fb1d9738ca053ea8afa5e86af6463155f983b01c
author Linus Torvalds <torvalds@linux-foundation.org> 1260998371 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260998371 -0800

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