Dave Airlie 51c8b4071d Merge Linus master to drm-next ... linux-next conflict reported needed resolution. Conflicts: drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_edid.c drivers/gpu/drm/i915/intel_sdvo.c drivers/gpu/drm/radeon/radeon_ttm.c drivers/gpu/drm/ttm/ttm_bo.c		2009-08-20 13:38:04 +10:00
..
ttm_bo_api.h
ttm_bo_driver.h	Merge Linus master to drm-next	2009-08-20 13:38:04 +10:00
ttm_memory.h
ttm_module.h	Merge Linus master to drm-next	2009-08-20 13:38:04 +10:00
ttm_placement.h