• Dave Airlie's avatar
    Merge commit '9e9a928e' into drm-next · 8d4ad9d4
    Dave Airlie authored
    Merge drm-fixes into drm-next.
    
    Both i915 and radeon need this done for later patches.
    
    Conflicts:
    	drivers/gpu/drm/drm_crtc_helper.c
    	drivers/gpu/drm/i915/i915_drv.h
    	drivers/gpu/drm/i915/i915_gem.c
    	drivers/gpu/drm/i915/i915_gem_execbuffer.c
    	drivers/gpu/drm/i915/i915_gem_gtt.c
    8d4ad9d4
drm_crtc_helper.c 26 KB