Merge branch 'drm-next' of ../drm-2.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 6 Nov 2009 04:33:40 +0000 (14:33 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 6 Nov 2009 04:33:40 +0000 (14:33 +1000)

Trivial merge