Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 18 Nov 2009 00:09:55 +0000 (10:09 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 18 Nov 2009 00:09:55 +0000 (10:09 +1000)

Trivial merge