]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit72968fdf1c19fe36b86e2f78dde3c493a299e6c5
treecb9163ac1c20f7fbdbde42eaab8013d0c3734aed
parenta3bd51081385ae70b27b40b645963b715a972743
parentdae437dbc7305bdf12baa1799f38d61eefe1b38a
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