]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit89f2044dbd1aaa842c52fac19691c8743eb4935c
tree7d97885644c7b6a09c244de11af94409da665e62
parentefb580f39871465b170065f5183cf1f258f040f7
parent526b40cbf0056f03df417b683df80ad805818c61
Merge remote branch 'origin/drm-core-next' into test

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