• Dave Airlie's avatar
    Merge remote branch 'anholt/drm-intel-next' into drm-linus · 3ff99164
    Dave Airlie authored
    This merges the upstream Intel tree and fixes up numerous conflicts
    due to patches merged into Linus tree later in -rc cycle.
    
    Conflicts:
    	drivers/char/agp/intel-agp.c
    	drivers/gpu/drm/drm_dp_i2c_helper.c
    	drivers/gpu/drm/i915/i915_irq.c
    	drivers/gpu/drm/i915/i915_suspend.c
    3ff99164
intel_crt.c 14.4 KB