OSDN Git Service

Merge branch 'ttm-vram-0-1-branch'
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
commita78f70faade8950ebb11ac8334c8c551f8e32b35
tree2396a74d645d40696c8c0e09394f90886409e898
parent35eb12d8bf91e7a3b0702385fa47b648194803c4
parent1345076c8f93936563cd5c15588b1d76d87969d3
Merge branch 'ttm-vram-0-1-branch'
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_drv.h