51c8b4071d
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 |
||
---|---|---|
.. | ||
ttm_bo_api.h | ||
ttm_bo_driver.h | ||
ttm_memory.h | ||
ttm_module.h | ||
ttm_placement.h |