Merge tag 'v2.6.35-rc6' into drm-radeon-next
authorDave Airlie <airlied@redhat.com>
Mon, 2 Aug 2010 00:05:18 +0000 (10:05 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Aug 2010 00:05:24 +0000 (10:05 +1000)
Need this to avoid conflicts with future radeon fixes


Trivial merge