Merge commit 'origin/gallium-0.1'

Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c

diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index dd01dc3,1fb4ed8..17ff61b
--- 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
@@@ -295,7 -302,7 +295,7 @@@ fenced_buffer_map(struct pb_buffer *buf
        ((fenced_buf->flags & PIPE_BUFFER_USAGE_GPU_READ) && (flags & PIPE_BUFFER_USAGE_CPU_WRITE))) {
        if(flags & PIPE_BUFFER_USAGE_DONTBLOCK) {
           /* Don't wait for the GPU to finish writing */
-          if(ops->fence_finish(ops, fenced_buf->fence, 0) == 0)
 -         if(winsys->fence_signalled(winsys, fenced_buf->fence, 0) == 0)
++         if(ops->fence_signalled(ops, fenced_buf->fence, 0) == 0)
              _fenced_buffer_remove(fenced_list, fenced_buf);
           else
              return NULL;