From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat, 26 Jul 2008 01:31:44 +0000 (-0700)
Subject: Merge branch 'master' into drm-gem
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e645b365900cf1c71ca5594bd6b549a1f203040;p=mesa.git

Merge branch 'master' into drm-gem

Conflicts:

	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
---

1e645b365900cf1c71ca5594bd6b549a1f203040