Merge branch 'nouveau-import'
authorDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 22:30:32 +0000 (09:30 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 22:30:32 +0000 (09:30 +1100)
commite3358dea660f5dec53a8be9e38d725f4fd829e14
treeb851da09fa21fe3a7e447cdc43a10ae816d3f910
parentb497a0cb7c607bfad3389c6831de0dfdc37ee5af
parent53d40646bdac2deb7954794e213154e0a4596278
Merge branch 'nouveau-import'