From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 1 Dec 2009 14:31:14 +0000 (+0000)
Subject: Merge commit 'origin/tgsi-simplify-ext'
X-Git-Tag: 062012170305~15687
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87eec80c1120d2cd9749ee360b77922feabf7f10;p=profile%2Fivi%2Fmesa.git

Merge commit 'origin/tgsi-simplify-ext'

Conflicts:
	src/gallium/drivers/r300/r300_vs.c
---

87eec80c1120d2cd9749ee360b77922feabf7f10