Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:37:33 +0000 (20:37 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:37:33 +0000 (20:37 +1000)
commitcbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60
treee4f67e46334b43f051a0605c7762cac36ad7c1f6
parent522139dd146450edfd3d2f07c627b32512a2c27e
parent81335d0f1760fe172a106f79e81281c1f0d7dedf
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2

Conflicts:
configs/linux-dri
configs/default