• Dave Airlie's avatar
    Merge intel drm-intel-next branch · 11670d3c
    Dave Airlie authored
    Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_drv.h
    	drivers/gpu/drm/i915/intel_sdvo.c
    11670d3c
intel_lvds.c 29.3 KB