Conflicts:

	src/gallium/auxiliary/draw/draw_pt_varray.c
	src/gallium/auxiliary/draw/draw_pt_varray_tmp.h
	src/gallium/auxiliary/draw/draw_pt_vcache.c