| commit | 1bd049fa895f9c6743f38b52ce14775f5a31ea63 | |
| author | Dave Airlie <airlied@redhat.com> | |
| Tue, 8 Dec 2009 03:52:41 +0000 (8 13:52 +1000) | ||
| committer | Dave Airlie <airlied@redhat.com> | |
| Tue, 8 Dec 2009 03:52:41 +0000 (8 13:52 +1000) | ||
| tree | cb9163ac1c20f7fbdbde42eaab8013d0c3734aed | treesnapshot (tar.gz zip) |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 | commitdiff |
| parent | b0a007dc27d8d3ff3db07b3ea997323d9330f770 | commitdiff |
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
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c