Merge commit 'origin/tgsi-simplify-ext'

Conflicts:
	src/gallium/drivers/r300/r300_vs.c

diff --cc src/gallium/auxiliary/draw/draw_pipe_aaline.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_pipe_pstipple.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_exec.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_sanity.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_ureg.c
Simple merge

diff --cc src/gallium/auxiliary/vl/vl_compositor.c
Simple merge

diff --cc src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
Simple merge

diff --cc src/gallium/drivers/nv50/nv50_program.c
Simple merge