]> git.baikalelectronics.ru Git - kernel.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)
commitddf17570b74709a1f861b591a14cf6c758f8f5d3
treef148c5bfad584ba8ac79d43fd3e40a12d49d92af
parent7d6ec116940993da8c062123560536a627b21705
parentbfd3419f8525470aee4bbf8c57b74665bea80fa7
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
drivers/gpu/drm/Makefile
drivers/staging/Kconfig
include/drm/Kbuild