Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/util/u_blit.c
	src/gallium/auxiliary/util/u_blit.h
	src/gallium/auxiliary/util/u_gen_mipmap.c
	src/gallium/auxiliary/util/u_gen_mipmap.h
	src/mesa/state_tracker/st_cb_texture.c
	src/mesa/state_tracker/st_gen_mipmap.c