Merge branch 'mesa_7_6_branch'

diff --cc Makefile
Simple merge

diff --cc docs/relnotes.html
index c18793c,560a660..7a87f58
--- 1/docs/relnotes.html
--- 2/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -13,8 -13,8 +13,9 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.7.html">7.7 release notes</A>
  <LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
+ <LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A>
  <LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
  <LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
  <LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>

diff --cc src/mesa/drivers/common/meta.c
Simple merge