linux/include/video
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
..
atmel_lcdc.h
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
display_timing.h video: display_timing: add doubleclk flag 2013-06-03 18:42:32 +10:00
edid.h
exynos_dp.h
exynos_mipi_dsim.h
gbe.h
hecubafb.h
iga.h
ili9320.h
Kbuild
kyro.h
mach64.h
maxinefb.h
mbxfb.h
metronomefb.h
mipi_display.h
mmp_disp.h
neomagic.h
newport.h
of_display_timing.h
of_videomode.h
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
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
sgivw.h
sh_mipi_dsi.h
sh_mobile_hdmi.h
sh_mobile_lcdc.h
sh_mobile_meram.h
sisfb.h
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
w100fb.h