Merge branch 'i965g-restart'

Conflicts:
	configure.ac

diff --cc Makefile
Simple merge

diff --cc SConstruct
Simple merge

diff --cc configs/default
Simple merge

diff --cc configure.ac
index dd0c78547c4563cd2157109841326da0732efd3e,ee1f914dedab32557d7ceacedbb8a0d9f9ef71bb..d83dd4315b7d2c1131b1c06b983d89be0c127575
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1216,15 -1206,13 +1216,15 @@@ dn
  dnl Gallium Intel configuration
  dnl
  AC_ARG_ENABLE([gallium-intel],
 -    [AS_HELP_STRING([--disable-gallium-intel],
 -        [build gallium intel @<:@default=enabled@:>@])],
 +    [AS_HELP_STRING([--enable-gallium-intel],
 +        [build gallium intel @<:@default=disabled@:>@])],
      [enable_gallium_intel="$enableval"],
 -    [enable_gallium_intel=yes])
 +    [enable_gallium_intel=auto])
  if test "x$enable_gallium_intel" = xyes; then
-     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel"
-     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
+     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
 +elif test "x$enable_gallium_intel" = xauto; then
-     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
++    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
  fi
  
  dnl

diff --cc src/gallium/auxiliary/util/u_debug.c
Simple merge

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

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