Skip to content
Commit 86a3073e authored by Keith Packard's avatar Keith Packard
Browse files

Merge branch 'edp-training-fixes' into drm-intel-next 

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

Just whitespace change conflicts
parents 0ac225e5 32ce697c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment