merge Linus head tree into my drm tree and fix up conflicts
authorDave Airlie <airlied@starflyer.(none)>
Thu, 20 Oct 2005 08:21:33 +0000 (18:21 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 20 Oct 2005 08:21:33 +0000 (18:21 +1000)

Trivial merge