Merge tag 'v2.6.35-rc4' into drm-testing
authorDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:37:34 +0000 (18:37 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:37:34 +0000 (18:37 +1000)

Trivial merge