Merge commit 'origin/master' into i965g-restart

Conflicts:
	SConstruct
	configs/default
	configs/linux-dri

diff --cc Makefile
Simple merge

diff --cc SConstruct
index d4db812db5583dd4d8188d6b2b20a637a9ca8f7c,f43c10cecb3fef5eb98aff5029f5c66a4164ee36..6ba2984537fa7be576fbf5491e183d1e8c4f7338
--- 1/SConstruct
--- 2/SConstruct
+++ b/SConstruct
@@@ -32,10 -32,10 +32,10 @@@ import commo
  default_statetrackers = 'mesa'
  
  if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_drivers = 'softpipe,failover,i915,i965,trace,identity,llvmpipe'
 -      default_drivers = 'softpipe,failover,svga,i915,trace,identity,llvmpipe'
++      default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
        default_winsys = 'xlib'
  elif common.default_platform in ('winddk',):
-       default_drivers = 'softpipe,i915,i965,trace,identity'
 -      default_drivers = 'softpipe,svga,i915,trace,identity'
++      default_drivers = 'softpipe,svga,i915,i965,trace,identity'
        default_winsys = 'all'
  else:
        default_drivers = 'all'
@@@ -46,9 -46,9 +46,9 @@@ common.AddOptions(opts
  opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                       ['mesa', 'python', 'xorg']))
  opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                      ['softpipe', 'failover', 'i915', 'i965', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
 -                     ['softpipe', 'failover', 'svga', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
++                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
  opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                      ['xlib', 'intel', 'i965', 'gdi', 'radeon']))
 -                     ['xlib', 'vmware', 'intel', 'gdi', 'radeon']))
++                     ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
  
  opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
  

diff --cc configs/default
index bc2f0995154812d259f0392f9b661b61576ac798,15f9285dbf69bb3b7a60c66e538417ba3d4d20cd..e6f66ed0354425b8e3f4d76d381448eda3ab7374
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -96,7 -96,7 +96,7 @@@ EGL_DRIVERS_DIRS = dem
  GALLIUM_DIRS = auxiliary drivers state_trackers
  GALLIUM_AUXILIARY_DIRS = rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices vl
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
- GALLIUM_DRIVERS_DIRS = i965 softpipe i915 failover trace identity
 -GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 trace identity
++GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 trace identity
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib
  GALLIUM_WINSYS_DRM_DIRS =

diff --cc configs/linux-dri
index b2394d13921b63b6cef3f5daf7e08f5679d4a965,0802543347a1af9326ede85d65b3e88a07d503c5..c54583a0c82d286683b1ebd03838f0655b6d7ebc
--- 1/configs/linux-dri
--- 2/configs/linux-dri
+++ b/configs/linux-dri
@@@ -60,7 -60,8 +60,7 @@@ EGL_DRIVERS_DIRS = demo gl
  DRIVER_DIRS = dri
  WINDOW_SYSTEM = dri
  GALLIUM_WINSYS_DIRS = drm
- GALLIUM_WINSYS_DRM_DIRS = intel i965
- GALLIUM_STATE_TRACKERS_DIRS = egl dri
 -GALLIUM_WINSYS_DRM_DIRS = vmware intel
++GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
+ GALLIUM_STATE_TRACKERS_DIRS = egl
  
 -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
 -      savage sis tdfx unichrome ffb swrast
 +DRI_DIRS = i915 i965 

diff --cc configure.ac
Simple merge

diff --cc progs/fp/fp-tri.c
Simple merge

diff --cc progs/trivial/tri-orig.c
Simple merge

diff --cc src/gallium/auxiliary/util/u_math.h
Simple merge

diff --cc src/gallium/winsys/drm/SConscript
Simple merge

diff --cc src/mesa/state_tracker/st_draw.c
Simple merge