Merge remote branch 'origin/mesa_7_7_branch'

Conflicts:
	configs/default
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/mesa/main/version.h

diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index a9375abd21880e52fef1cec4910ee8f38adfc578,1ee2bf9b7c5459b1c6420d2b3908f0afc01147f1..ba6f7b15f9ec5ec48dfcde867d67b48a688f37ea
--- 1/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
--- 2/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@@ -272,9 -274,7 +275,8 @@@ fenced_buffer_list_check_free_locked(st
        fenced_buffer_remove_locked(fenced_list, fenced_buf);
        pipe_mutex_unlock(fenced_buf->mutex);
  
 -      pb_reference((struct pb_buffer **)&fenced_buf, NULL);
 +      pb_buf = &fenced_buf->base;
 +      pb_reference(&pb_buf, NULL);
-       
  
        curr = next; 
        next = curr->next;

diff --cc src/gallium/drivers/svga/svga_context.h
Simple merge

diff --cc src/gallium/drivers/svga/svga_pipe_vs.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_state_vs.c
Simple merge

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