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

Conflicts:

	src/mesa/pipe/Makefile

diff --cc src/mesa/pipe/Makefile
index fbd36d95f7a4f67faedeffad3eeed70297b73d27,d880d090c15b43ef7b2e2607117ad7003b7146e7..6012b2bceadd07dc8c9ee17746ba698301300f23
--- 1/src/mesa/pipe/Makefile
--- 2/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -6,8 -6,11 +6,12 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover \
-         pipebuffer $(CELL_DIR)
+ ifeq ($(CONFIG_NAME), linux-llvm)
+ LLVM_DIR = llvm
+ endif
+ 
 -SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR) $(LLVM_DIR)
++SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover pipebuffer \
++        $(CELL_DIR) $(LLVM_DIR)
  
  
  default: subdirs