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
Showing
This diff is collapsed.
This diff is collapsed.
include/drm/ttm/ttm_lock.h
0 → 100644
include/drm/ttm/ttm_object.h
0 → 100644
Please register or sign in to comment