Merge remote branch 'origin/drm-core-next' into test
authorDave Airlie <airlied@redhat.com>
Mon, 7 Dec 2009 21:03:55 +0000 (07:03 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 7 Dec 2009 21:03:55 +0000 (07:03 +1000)
Conflicts:
drivers/gpu/drm/drm_fb_helper.c


Trivial merge