Files
linux/drivers/video
Dave Airlie 4300a0f8bd Merge tag 'v3.10-rc7' into drm-next
Linux 3.10-rc7

The sdvo lvds fix in this -fixes pull

commit c3456fb3e4
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 990256aec2
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
2013-06-27 20:40:44 +10:00
..
2013-06-27 10:08:04 +10:00
2013-02-22 23:31:31 -05:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2013-04-18 13:03:53 +10:00
2013-02-22 23:31:31 -05:00
2013-04-24 08:41:41 +03:00
2013-04-26 08:28:56 +03:00
2013-03-20 16:26:32 +01:00
2013-04-12 14:01:40 +10:00
2013-05-02 14:59:21 +03:00
2013-04-12 15:21:36 +02:00
2013-04-24 08:41:42 +03:00
2013-04-26 08:28:56 +03:00
2013-04-12 15:21:36 +02:00
2013-04-26 08:28:56 +03:00
2013-05-31 13:37:36 +10:00
2013-04-26 08:28:56 +03:00