Merge branch 'edp-training-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 20 Oct 2011 20:40:33 +0000 (13:40 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 20 Oct 2011 21:10:07 +0000 (14:10 -0700)
commit86a3073e480c522f12e5291a462f68f6ee30aee3
tree5804f9d944084ff5245d07e8340779a4ecd52f9b
parent0ac225e56997ef89f46eb51b02799a685b78f214
parent32ce697c53f41290c3a2d3807b521b0fe4f42d2a
Merge branch 'edp-training-fixes' into drm-intel-next

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

Just whitespace change conflicts
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_bios.h
drivers/gpu/drm/i915/intel_dp.c