Merge branch 'mesa_7_5_branch'

diff --cc src/glx/x11/dri2_glx.c
Simple merge

diff --cc src/glx/x11/glxclient.h
Simple merge

diff --cc src/glx/x11/glxext.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_flush.c
Simple merge