Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

diff --cc configs/default
Simple merge

diff --cc configure.ac
Simple merge

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

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

diff --cc src/mesa/shader/slang/slang_link.c
Simple merge