| commit | 312f5726055534be1dc9dd369be13aabd2943fcb | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@starflyer.(none)> | Thu Oct 20 18:21:33 2005 +1000 |
| committer | Dave Airlie <airlied@linux.ie> | Thu Oct 20 18:21:33 2005 +1000 |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 [diff] | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 [diff] |
merge Linus head tree into my drm tree and fix up conflicts