Conflicts:
	src/gallium/drivers/llvmpipe/lp_rast.c
	src/gallium/drivers/llvmpipe/lp_scene.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/llvmpipe/lp_texture.h
	src/gallium/drivers/softpipe/sp_texture.c
	src/gallium/drivers/svga/svga_screen_texture.c