From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 16 Mar 2010 09:02:38 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-sampler-view
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cdfd1219a2d13d252a8691ee6dddb0d773bdc77;p=mesa.git

Merge commit 'origin/master' into gallium-sampler-view

This branch already seems to have the nv50_tex.c fix.

Conflicts:
	src/gallium/drivers/nv50/nv50_tex.c
---

8cdfd1219a2d13d252a8691ee6dddb0d773bdc77