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
..
Kbuild	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
atmel_lcdc.h	ARM: at91/avr32/atmel_lcdfb: add platform device-id table	2013-03-13 11:05:12 +01:00
aty128.h	…
auo_k190xfb.h	AUO-K190x: Add resolutions for portrait displays	2013-04-04 13:08:07 +03:00
broadsheetfb.h	…
cirrus.h	…
cvisionppc.h	…
da8xx-fb.h	da8xx-fb: cleanup LCDC configurations	2012-11-27 11:47:53 +02:00
display_timing.h	video: display_timing: add doubleclk flag	2013-06-03 18:42:32 +10:00
edid.h	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
exynos_dp.h	…
exynos_mipi_dsim.h	drivers/video/exynos/exynos_mipi_dsi.c: use devm_* APIs	2013-02-21 17:22:18 -08:00
gbe.h	…
hecubafb.h	…
iga.h	…
ili9320.h	…
kyro.h	…
mach64.h	…
maxinefb.h	…
mbxfb.h	…
metronomefb.h	…
mipi_display.h	…
mmp_disp.h	video: mmp display subsystem	2013-02-21 17:22:17 -08:00
neomagic.h	…
newport.h	…
of_display_timing.h	video: add of helper for display timings/videomode	2013-01-24 09:03:48 +01:00
of_videomode.h	video: add of helper for display timings/videomode	2013-01-24 09:03:48 +01:00
omap-panel-data.h	OMAPDSS: n8x0: remove platform backlight calls	2013-04-03 15:19:45 +03:00
omapdss.h	Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes	2013-05-29 17:00:34 +08:00
omapvrfb.h	OMAPDSS: VRFB: add omap_vrfb_supported()	2012-10-17 12:17:18 +03:00
permedia2.h	…
platform_lcd.h	drivers/video/backlight/platform_lcd.c: introduce probe callback	2013-04-29 18:28:18 -07:00
pm3fb.h	…
pmag-ba-fb.h	…
pmagb-b-fb.h	…
pxa168fb.h	…
radeon.h	…
s1d13xxxfb.h	…
sa1100fb.h	…
samsung_fimd.h	video: s3c-fb: fix typo in definition of VIDCON1_VSTATUS_FRONTPORCH value	2013-02-21 17:22:18 -08:00
sgivw.h	…
sh_mipi_dsi.h	fbdev: sh_mipi_dsi: Remove the unused sh_mipi_dsi_info lcd_chan field	2012-11-21 15:50:01 +01:00
sh_mobile_hdmi.h	…
sh_mobile_lcdc.h	fbdev: sh_mobile_lcdc: Remove unused get_brightness pdata callback	2012-11-21 15:50:02 +01:00
sh_mobile_meram.h	sh_mobile_meram: Add direct MERAM allocation API	2012-07-19 02:05:22 +02:00
sisfb.h	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
sstfb.h	…
tdfx.h	…
tgafb.h	…
trident.h	…
udlfb.h	…
uvesafb.h	uvesafb: Clean up MTRR code	2013-05-31 13:37:36 +10:00
vga.h	…
videomode.h	videomode: videomode_from_timing work	2013-03-21 14:34:33 +02:00
w100fb.h	…