Merge branch 'drm-next' of ../drm-2.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 28 Oct 2009 06:08:41 +0000 (16:08 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 28 Oct 2009 06:08:41 +0000 (16:08 +1000)

Trivial merge