Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 25 May 2008 04:19:18 +0000 (14:19 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 25 May 2008 04:19:18 +0000 (14:19 +1000)
1  2 
configs/linux-dri

Simple merge