Files
linux-stable-mirror/include/linux/platform_data
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
..
2012-10-19 18:46:51 +01:00
2012-12-05 10:55:54 -08:00
2013-04-29 18:28:13 -07:00
2012-11-02 12:00:36 -07:00
2013-04-03 10:30:34 +09:00
2012-12-03 18:48:23 +01:00
2012-12-06 13:54:51 -05:00