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)
commit594064b3b342e0b4312bd72764ed8f54369ef922
tree5804f9d944084ff5245d07e8340779a4ecd52f9b
parent0fddb084e7fdb2657e56e6d684104f8b39accc82
parent4771a6aa3bec56243852ef742cdeef65f439d9b3
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