Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm

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

Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)

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

Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)
author Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)
committer Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)
diff --cc linux-core/drmP.h
Simple merge
diff --cc linux-core/drm_memory.c
Simple merge
diff --cc shared-core/drm.h
Simple merge
author	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)
committer	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Thu, 19 Oct 2006 15:07:26 +0000 (17:07 +0200)
		1	2
linux-core/drmP.h	patch \|	diff1 \|	diff2 \|	blob \| history
linux-core/drm_memory.c	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/drm.h	patch \|	diff1 \|	diff2 \|	blob \| history