Conflicts:
	src/gallium/include/pipe/p_context.h
	src/mesa/state_tracker/st_atom_texture.c
	src/mesa/state_tracker/st_cb_bitmap.c
	src/mesa/state_tracker/st_cb_drawpixels.c
	src/mesa/state_tracker/st_cb_texture.c
	src/mesa/state_tracker/st_context.c
	src/mesa/state_tracker/st_context.h
	src/mesa/state_tracker/st_texture.h