Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:
	configs/default

diff --cc configs/default
index 144351460699bb2ccb27da3157038b76e4f3e5f6,cd2c39c3650f3f87005191264c0f68024809c185..263955dde9022cb22d9d4ac7cd573562df96c164
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -72,8 -72,7 +72,7 @@@ EGL_DRIVERS_DIRS = dem
  # Gallium directories and 
  GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
- GALLIUM_WINSYS_COMMON_DIRS =
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib
  

diff --cc configs/linux-dri
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_context.c
Simple merge