Merge commit 'origin/master' into gallium-sw-api-2

author Keith Whitwell <keithw@vmware.com>

Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)

committer Keith Whitwell <keithw@vmware.com>

Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
author Keith Whitwell <keithw@vmware.com>
Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
committer Keith Whitwell <keithw@vmware.com>
Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
diff --cc src/gallium/drivers/cell/ppu/cell_context.h
Simple merge
diff --cc src/gallium/drivers/softpipe/sp_context.c
Simple merge
diff --cc src/gallium/drivers/softpipe/sp_context.h
Simple merge
author	Keith Whitwell <keithw@vmware.com>
	Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
committer	Keith Whitwell <keithw@vmware.com>
	Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
		1	2
src/gallium/drivers/cell/ppu/cell_context.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.h	patch \|	diff1 \|	diff2 \|	blob \| history