Merge tag 'drm-intel-next-2013-12-13' of git://people.freedesktop.org/~danvet/drm...

[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_dp.c

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge