From: Eric Anholt <eric@anholt.net>
Date: Mon, 2 Aug 2010 02:23:53 +0000 (-0700)
Subject: Merge remote branch 'origin/master' into drm-intel-next
X-Git-Tag: v2.6.36-rc1~540^2~11^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd34f6ca86b5a5f9b749624f73310820e7a93fd;p=pandora-kernel.git

Merge remote branch 'origin/master' into drm-intel-next

This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

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

2bd34f6ca86b5a5f9b749624f73310820e7a93fd
Reading git-diff-tree failed