Merge commit 'origin/gallium-winsys-handle-rebased'

diff --cc src/gallium/drivers/i965/brw_screen_texture.c
Simple merge

diff --cc src/gallium/drivers/nv30/nv30_miptree.c
Simple merge

diff --cc src/gallium/drivers/nv40/nv40_miptree.c
Simple merge

diff --cc src/gallium/drivers/nv50/nv50_miptree.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_context.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_screen.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_texture.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_texture.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_screen_texture.c
Simple merge

diff --cc src/gallium/state_trackers/dri/dri_drawable.c
Simple merge

diff --cc src/gallium/state_trackers/egl/kms/native_kms.c
Simple merge

diff --cc src/gallium/state_trackers/egl/x11/native_dri2.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_crtc.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_dri2.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_exa.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xvmc/surface.c
Simple merge

diff --cc src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
Simple merge