From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 6 Jan 2010 13:52:22 +0000 (+0000)
Subject: Merge remote branch 'origin/mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e32487b8a13a9efabb0359a9dde33e074e905e82;p=mesa.git

Merge remote branch 'origin/mesa_7_7_branch'

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

e32487b8a13a9efabb0359a9dde33e074e905e82
diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index a9375abd218,1ee2bf9b7c5..ba6f7b15f9e
--- a/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;