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
..
Kconfig	drm/tilcd: select BACKLIGHT_LCD_SUPPORT	2013-06-03 19:20:49 +10:00
Makefile	drivers/gpu/drm/tilcdc: Makefile, only -Werror when no -W* in EXTRA_CFLAGS	2013-04-24 14:34:40 +10:00
tilcdc_crtc.c	drm: Drop all the stub gamma_get, gamma_set, load_lut functions from drivers	2013-06-17 19:42:47 +10:00
tilcdc_drv.c	gpu:drm:tilcdc: get preferred_bpp value from DT	2013-06-20 14:08:01 +10:00
tilcdc_drv.h	gpu:drm:tilcdc: get preferred_bpp value from DT	2013-06-20 14:08:01 +10:00
tilcdc_panel.c	gpu:drm:tilcdc: get preferred_bpp value from DT	2013-06-20 14:08:01 +10:00
tilcdc_panel.h	drm/tilcdc: add support for LCD panels (v5)	2013-02-19 17:57:45 -05:00
tilcdc_regs.h
tilcdc_slave.c	gpu:drm:tilcdc: get preferred_bpp value from DT	2013-06-20 14:08:01 +10:00
tilcdc_slave.h	drm/tilcdc: add encoder slave (v2)	2013-02-19 17:57:44 -05:00
tilcdc_tfp410.c	gpu:drm:tilcdc: get preferred_bpp value from DT	2013-06-20 14:08:01 +10:00
tilcdc_tfp410.h