Merge branch 'mesa_7_6_branch'

diff --cc src/mesa/drivers/dri/i915/intel_tris.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_context.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
Simple merge

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

diff --cc src/mesa/drivers/dri/intel/intel_context.h
Simple merge

diff --cc src/mesa/main/context.c
Simple merge