• Daniel Vetter's avatar
    Merge tag 'v3.14' into drm-intel-next-queued · 0654a65f
    Daniel Vetter authored
    Linux 3.14
    
    The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence
    backmerge.
    
    Conflicts:
    	drivers/gpu/drm/i915/i915_gem_gtt.c
    	drivers/gpu/drm/i915/intel_ddi.c
    	drivers/gpu/drm/i915/intel_dp.c
    
    All trivial adjacent lines changed type conflicts, so trivial git
    doesn't even show them in the merg commit.
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    0654a65f
udl_gem.c 5.81 KB