Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 22 Jun 2008 14:01:17 +0000 (00:01 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 22 Jun 2008 14:01:17 +0000 (00:01 +1000)
commitaa3ab377e6e2e5811cdd704d87c3e24acb5eff72
treeab8a443a58a58a6b88f35d4b5730ed1292e44d26
parent8c26a521ee80f5d8a1d0aabd0910233aad400322
parente2c3f06e9649b5b87fc9adbca7d1f07841bba895
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:

configs/default
configs/default
configs/linux-dri