1
0
Files
linux/arch/x86/include/asm
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
..
2011-08-29 13:44:12 -07:00
2012-11-29 13:23:02 -08:00
2012-03-28 18:11:12 +01:00
2012-09-19 17:26:08 +02:00
2012-03-28 18:11:12 +01:00
2013-04-25 10:39:04 +02:00
2012-11-14 15:28:11 -08:00
2011-05-02 17:24:48 +02:00
2013-06-10 21:59:37 +01:00
2012-03-28 18:11:12 +01:00
2013-02-14 09:21:17 -05:00
2012-11-29 13:23:02 -08:00
2011-04-18 09:26:48 -07:00
2012-03-20 21:48:30 +08:00
2013-02-03 18:16:27 -05:00
2012-06-25 13:48:30 +02:00
2011-07-22 14:39:50 +09:30
2013-04-22 15:45:03 +09:30
2012-11-29 13:23:02 -08:00
2012-01-26 21:23:53 +01:00
2013-04-02 16:03:32 -07:00
2013-04-02 16:03:29 -07:00
2011-03-15 15:34:15 -07:00
2013-04-02 10:12:55 -07:00
2012-02-20 12:52:05 -08:00
2013-02-03 18:16:27 -05:00
2012-03-28 18:11:12 +01:00
2012-03-28 18:11:12 +01:00
2011-06-05 21:30:32 +02:00
2012-09-21 17:18:44 -07:00