From: Ben Skeggs <skeggsb@gmail.com>
Date: Fri, 12 Sep 2008 10:37:33 +0000 (+1000)
Subject: Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60;p=mesa.git

Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2

Conflicts:
	configs/linux-dri
---

cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60