Merge branch 'master' into modesetting-gem

author Jesse Barnes <jbarnes@virtuousgeek.org>

Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)

committer Jesse Barnes <jbarnes@virtuousgeek.org>

Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)
author Jesse Barnes <jbarnes@virtuousgeek.org>
Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)
committer Jesse Barnes <jbarnes@virtuousgeek.org>
Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)
diff --cc configure.ac
Simple merge
diff --cc libdrm/intel/intel_bufmgr.h
Simple merge
diff --cc libdrm/intel/intel_bufmgr_gem.c
Simple merge
author	Jesse Barnes <jbarnes@virtuousgeek.org>
	Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)
committer	Jesse Barnes <jbarnes@virtuousgeek.org>
	Wed, 3 Dec 2008 19:54:07 +0000 (11:54 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libdrm/intel/intel_bufmgr.h	patch \|	diff1 \|	diff2 \|	blob \| history
libdrm/intel/intel_bufmgr_gem.c	patch \|	diff1 \|	diff2 \|	blob \| history