Merge branch 'v2.6.34-rc2' into drm-linus
authorDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2010 04:55:14 +0000 (14:55 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2010 04:55:14 +0000 (14:55 +1000)

Trivial merge