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

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

Just whitespace change conflicts
This commit is contained in:
Keith Packard 2011-10-20 13:40:33 -07:00
commit 86a3073e48
5 changed files with 414 additions and 122 deletions