Conflicts:
	src/gallium/auxiliary/cso_cache/cso_context.c
	src/gallium/auxiliary/cso_cache/cso_context.h
	src/gallium/drivers/r300/r300_context.c
	src/gallium/drivers/r300/r300_render.c
	src/gallium/drivers/r300/r300_state.c
	src/gallium/drivers/r300/r300_state_derived.c
	src/gallium/state_trackers/vega/api_filters.c
	src/gallium/state_trackers/vega/image.c
	src/gallium/state_trackers/vega/image.h
	src/gallium/state_trackers/vega/mask.c
	src/gallium/state_trackers/vega/mask.h
	src/gallium/state_trackers/vega/paint.c
	src/gallium/state_trackers/vega/paint.h
	src/gallium/state_trackers/vega/renderer.c
	src/gallium/state_trackers/vega/renderer.h
	src/gallium/state_trackers/vega/shader.c
	src/gallium/state_trackers/vega/vg_context.h
	src/gallium/state_trackers/vega/vg_tracker.c
	src/mesa/state_tracker/st_manager.c