]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commitf84676185368e36c6bc0eeab87ab73ed39042648
tree7d97885644c7b6a09c244de11af94409da665e62
parent22dd50133ab7548adb23e86c302d6e8b75817e8c
parent447aeb907e417e0e837b4a4026d5081c88b6e8ca
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