Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

author Alan Hourihane <alanh@tungstengraphics.com>

Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)

committer Alan Hourihane <alanh@tungstengraphics.com>

Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)
author Alan Hourihane <alanh@tungstengraphics.com>
Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)
committer Alan Hourihane <alanh@tungstengraphics.com>
Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)
diff --cc linux-core/drm_bo.c
Simple merge
diff --cc shared-core/drm.h
Simple merge
diff --cc shared-core/i915_dma.c
Simple merge
diff --cc shared-core/i915_drv.h
Simple merge
author	Alan Hourihane <alanh@tungstengraphics.com>
	Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)
committer	Alan Hourihane <alanh@tungstengraphics.com>
	Thu, 13 Dec 2007 10:41:23 +0000 (10:41 +0000)
		1	2
linux-core/drm_bo.c	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/drm.h	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/i915_dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	patch \|	diff1 \|	diff2 \|	blob \| history