Conflicts:
	src/gallium/drivers/cell/ppu/cell_screen.c
	src/gallium/drivers/cell/ppu/cell_texture.c
	src/gallium/drivers/llvmpipe/lp_screen.c
	src/gallium/drivers/r300/r300_context.c
	src/gallium/drivers/r300/r300_render.c
	src/gallium/drivers/r300/r300_screen.c
	src/gallium/drivers/r300/r300_state.c
	src/gallium/drivers/r300/r300_texture.c
	src/gallium/drivers/r300/r300_transfer.c
	src/gallium/state_trackers/egl/common/egl_g3d.h
	src/gallium/state_trackers/egl/kms/native_kms.c
	src/gallium/state_trackers/egl/x11/native_dri2.c
	src/gallium/state_trackers/egl/x11/native_ximage.c