Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline

author Nian Wu <nian@graphics.(none)>

Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)

committer Nian Wu <nian@graphics.(none)>

Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
author Nian Wu <nian@graphics.(none)>
Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
committer Nian Wu <nian@graphics.(none)>
Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
diff --cc src/mesa/drivers/dri/i965/intel_context.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/intel_context.h
Simple merge
author	Nian Wu <nian@graphics.(none)>
	Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
committer	Nian Wu <nian@graphics.(none)>
	Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
		1	2
src/mesa/drivers/dri/i965/intel_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/intel_context.h	patch \|	diff1 \|	diff2 \|	blob \| history