Merge branch 'drm-linus' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Thu, 17 Dec 2009 23:56:49 +0000 (09:56 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Dec 2009 23:56:49 +0000 (09:56 +1000)

Trivial merge