From: Christian König <deathsimple@vodafone.de>
Date: Tue, 11 Jan 2011 23:48:10 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b;p=mesa.git

Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_shader.c
---

a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b