Merge branch 'ttm-vram-0-1-branch'

author Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>

Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)

committer Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>

Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
author Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
committer Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
diff --cc linux-core/Makefile.kernel
Simple merge
diff --cc linux-core/drmP.h
Simple merge
diff --cc linux-core/drm_stub.c
Simple merge
diff --cc shared-core/drm.h
Simple merge
diff --cc shared-core/i915_drv.h
Simple merge
author	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
committer	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Wed, 14 Feb 2007 14:33:40 +0000 (15:33 +0100)
		1	2
linux-core/Makefile.kernel	patch \|	diff1 \|	diff2 \|	blob \| history
linux-core/drmP.h	patch \|	diff1 \|	diff2 \|	blob \| history
linux-core/drm_stub.c	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/drm.h	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	patch \|	diff1 \|	diff2 \|	blob \| history