| commit | cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60 | [log] [tgz] |
|---|---|---|
| author | Ben Skeggs <skeggsb@gmail.com> | Fri Sep 12 20:37:33 2008 +1000 |
| committer | Ben Skeggs <skeggsb@gmail.com> | Fri Sep 12 20:37:33 2008 +1000 |
| tree | e4f67e46334b43f051a0605c7762cac36ad7c1f6 | |
| parent | 522139dd146450edfd3d2f07c627b32512a2c27e [diff] | |
| parent | 81335d0f1760fe172a106f79e81281c1f0d7dedf [diff] |
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2 Conflicts: configs/linux-dri