Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/dri/intel/intel_clear.c

diff --cc src/mesa/drivers/dri/intel/intel_clear.c
index fef977f,1b0e221..fb62f0f
--- 1/src/mesa/drivers/dri/intel/intel_clear.c
--- 2/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@@ -172,8 -172,7 +172,7 @@@ intelClear(GLcontext *ctx, GLbitfield m
         DBG("\n");
        }
  
 -      _mesa_meta_clear(&intel->ctx, tri_mask);
 +      _mesa_meta_Clear(&intel->ctx, tri_mask);
-       intel_batchbuffer_flush(intel->batch);
     }
  
     if (swrast_mask) {