Merge branch 'mesa_7_7_branch'

diff --cc src/mesa/drivers/dri/intel/intel_extensions.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
Simple merge

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