Merge branch 'r500-support'
authorDave Airlie <airlied@linux.ie>
Thu, 3 Jan 2008 06:05:13 +0000 (16:05 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 3 Jan 2008 06:05:13 +0000 (16:05 +1000)

Trivial merge