Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
	src/mesa/pipe/Makefile
	src/mesa/pipe/draw/draw_vertex_fetch.c
	src/mesa/pipe/i915simple/i915_texture.c
	src/mesa/pipe/softpipe/sp_texture.c
	src/mesa/pipe/xlib/xm_winsys.c
	src/mesa/state_tracker/st_cb_fbo.c

diff --cc src/mesa/pipe/Makefile
index 5099b65885ee3e06f14063cb6e82f74f9f96b49b,2bf7318d59a3e8fc637645cb88fe6c1e1d3c3c7f..e4b72e49409e002437b0e8cbd6ea86af5ec93473
--- 1/src/mesa/pipe/Makefile
--- 2/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -7,7 -6,7 +6,7 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple nv40 nv50 failover $(CELL_DIR)
 -SUBDIRS = softpipe i915simple failover pipebuffer $(CELL_DIR)
++SUBDIRS = softpipe i915simple nv40 nv50 failover pipebuffer $(CELL_DIR)
  
  
  default: subdirs