Conflicts: drivers/gpu/drm/i915/intel_dp.c Just whitespace change conflicts
Attach a file by drag & drop or click to upload
