Merge remote branch 'korg/drm-core-next' into drm-testing
authorDave Airlie <airlied@redhat.com>
Fri, 8 Jan 2010 03:29:41 +0000 (13:29 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Jan 2010 03:29:41 +0000 (13:29 +1000)

Trivial merge