• Dave Airlie's avatar
    Merge Linus master to drm-next · 51c8b407
    Dave Airlie authored
    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
    51c8b407
ttm_module.h 2.09 KB