Commits

Merge branch 'edp-training-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_dp.c Just whitespace change conflicts
Merge branch 'edp-training-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_dp.c Just whitespace change conflicts