From: Dave Airlie <airlied@redhat.com>
Date: Thu, 27 Jun 2013 10:40:44 +0000 (+1000)
Subject: Merge tag 'v3.10-rc7' into drm-next
X-Git-Tag: v3.11-rc1~65^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4;p=pandora-kernel.git

Merge tag 'v3.10-rc7' into drm-next

Linux 3.10-rc7

The sdvo lvds fix in this -fixes pull

commit c3456fb3e4712d0448592af3c5d644c9472cd3c1
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Jun 10 09:47:58 2013 +0200

    drm/i915: prefer VBT modes for SVDO-LVDS over EDID

has a silent functional conflict with

commit 990256aec2f10800595dddf4d1c3441fcd6b2616
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Fri May 31 12:17:07 2013 +0000

    drm: Add probed modes in probe order

in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
other way round than now.

Conflicts:
	drivers/gpu/drm/drm_prime.c
	drivers/gpu/drm/i915/intel_sdvo.c
---

4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4
Reading git-diff-tree failed