Merge branch 'master' into i915-unification
authorEric Anholt <eric@anholt.net>
Fri, 18 May 2007 21:14:12 +0000 (14:14 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 18 May 2007 21:14:12 +0000 (14:14 -0700)
commit1bdee1853627e08894bd267b8f0ec176a1b5978f
tree78c3b8bb81e866de4544d2621abb633b008095ab
parentc085e350df593ab2af60f53b86265db4c3eab38a
parent4fca6bfa5d211a093c54b0bbeadaa38081e8c141
Merge branch 'master' into i915-unification

Conflicts:

src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/intel_batchpool.c
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
src/mesa/drivers/dri/i915tex/intel_regions.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_screen.h
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_screen.c