Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/gallium/drivers/softpipe/sp_screen.c
	src/mesa/main/version.h

diff --cc docs/relnotes.html
index ad5b74b,4764eb6..35a4c73
--- 1/docs/relnotes.html
--- 2/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -20,8 -13,9 +13,10 @@@ 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.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>
  <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>
  <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>
  <LI><A HREF="relnotes-7.4.html">7.4 release notes</A>

diff --cc scons/gallium.py
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_screen.c
index 692deeb,cc39d33..be76f1d
--- 1/src/gallium/drivers/softpipe/sp_screen.c
--- 2/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@@ -86,7 -86,9 +86,9 @@@ softpipe_get_param(struct pipe_screen *
     case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
        return 8;  /* max 128x128x128 */
     case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
 -      return 12; /* max 2Kx2K */
 +      return 13; /* max 4Kx4K */
+    case PIPE_CAP_TGSI_CONT_SUPPORTED:
+       return 1;
     default:
        return 0;
     }

diff --cc src/gallium/include/pipe/p_defines.h
Simple merge

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

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/shader/shader_api.c
Simple merge

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