Merge remote branch 'origin/mesa_7_6_branch'

author Eric Anholt <eric@anholt.net>

Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)

committer Eric Anholt <eric@anholt.net>

Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
author Eric Anholt <eric@anholt.net>
Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
committer Eric Anholt <eric@anholt.net>
Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/brw_sf_state.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/brw_wm_emit.c
Simple merge
author	Eric Anholt <eric@anholt.net>
	Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
committer	Eric Anholt <eric@anholt.net>
	Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
		1	2
src/mesa/drivers/dri/i965/brw_draw_upload.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_sf_state.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_wm_emit.c	patch \|	diff1 \|	diff2 \|	blob \| history