Merge branch 'drm-core-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 03:52:41 +0000 (13:52 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 03:52:41 +0000 (13:52 +1000)
commit1bd049fa895f9c6743f38b52ce14775f5a31ea63
treecb9163ac1c20f7fbdbde42eaab8013d0c3734aed
parent22763c5cf3690a681551162c15d34d935308c8d7
parentb0a007dc27d8d3ff3db07b3ea997323d9330f770
Merge branch 'drm-core-next' into drm-linus

Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_mm.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/ttm/ttm_tt.c