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
..
asm-generic	net: add option to enable error queue packets waking select	2013-03-31 19:44:20 -04:00
drm	drm/i915: add I915_PARAM_HAS_VEBOX to i915_getparam	2013-05-31 20:54:22 +02:00
linux	kvm: Add definition of KVM_REG_MIPS	2013-06-11 11:06:34 +03:00
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
rdma	IB/uverbs: Implement memory windows support in uverbs	2013-02-21 11:59:09 -08:00
scsi	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
sound	ALSA: add DSD formats	2013-04-18 10:02:33 +02:00
video	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
xen	UAPI: (Scripted) Disintegrate include/xen	2012-10-09 09:49:15 +01:00
Kbuild