merge linus head to drm-mm branch
authorDave Airlie <airlied@starflyer.(none)>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 22 Oct 2005 05:24:35 +0000 (15:24 +1000)

Trivial merge