Merge ../linux-2.6/
authorDave Airlie <airlied@starflyer.(none)>
Thu, 7 Jul 2005 10:08:27 +0000 (20:08 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 7 Jul 2005 10:08:27 +0000 (20:08 +1000)

Trivial merge