From: Keith Packard <keithp@keithp.com>
Date: Thu, 20 Oct 2011 20:40:33 +0000 (-0700)
Subject: Merge branch 'edp-training-fixes' into drm-intel-next
X-Git-Tag: v3.2-rc1~135^2~2^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a3073e480c522f12e5291a462f68f6ee30aee3;p=pandora-kernel.git

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

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

Just whitespace change conflicts
---

86a3073e480c522f12e5291a462f68f6ee30aee3
Reading git-diff-tree failed