Dave Airlie 4300a0f8bd Linux 3.10-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQEbBAABAgAGBQJRxf9cAAoJEHm+PkMAQRiGMWkH911xM4gRmFgE7SqVW4F4AWBm ngcqMqNy9IdqKfibORUUDvVfEa5gjD5ai2quIKpfQiaukbpQJ696H90ijuAkajLn DQBrN243s0pzhhc/quWINnWxsFQ613JjdUMUMaD7e9A1aKjYzWrPGt/tSjrFXGCP tArTupVzc/iOmnEQDKiROI/Nokq44QJ36aTGPM7n08xMtpKmkCXM+9/UosBteB0O HVI33dmjwz7i55fI53XAWyuZCE+gSEnA4z8spJ9LfXso2W14V+roc+GuL6OyeeTI pCn/+4niVPb4B0ROZlpyVmdZjbPPcMMEK5o+BSJI68SH6LHZTQh2iVuqYfpSyA== =uUH5 -----END PGP SIGNATURE----- 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
..
amd.c	x86, mtrr: Constify struct mtrr_ops	2010-02-01 11:20:43 -08:00
centaur.c	x86, mtrr: Constify struct mtrr_ops	2010-02-01 11:20:43 -08:00
cleanup.c	x86, mtrr: Fix original mtrr range get for mtrr_cleanup	2013-06-18 11:32:02 -05:00
cyrix.c	x86, mtrr: Constify struct mtrr_ops	2010-02-01 11:20:43 -08:00
generic.c	taint: add explicit flag to show whether lock dep is still OK.	2013-01-21 17:17:57 +10:30
if.c	x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls	2012-03-01 12:48:52 -08:00
main.c	Add arch_phys_wc_{add, del} to manipulate WC MTRRs if needed	2013-05-31 13:02:52 +10:00
Makefile	x86, mtrr: Remove unused mtrr/state.c	2010-02-04 10:01:38 +01:00
mtrr.h	x86, mtrr: Constify struct mtrr_ops	2010-02-01 11:20:43 -08:00