Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h

diff --cc Makefile
Simple merge

diff --cc docs/relnotes.html
index 35a4c73,7b91a3d..ddd2e1c
--- 1/docs/relnotes.html
--- 2/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -13,7 -13,7 +13,8 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.6.html">7.6 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>
  <LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>

diff --cc progs/trivial/.gitignore
Simple merge

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