linux-stable/drivers/staging
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
..
android staging: alarm-dev: information leak in alarm_compat_ioctl() 2013-06-04 10:26:14 -07:00
asus_oled
bcm
ced1401
comedi staging: comedi: complain if dma buffer allocation not supported 2013-05-13 17:38:48 -04:00
cptm1217
crystalhd
csr staging: single_open() leaks 2013-05-05 00:15:43 -04:00
cxt1e1 staging: single_open() leaks 2013-05-05 00:15:43 -04:00
dgrp Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
dwc2 staging: dwc2: fix value of dma_mask 2013-05-30 21:14:30 +09:00
echo
et131x
frontier
ft1000 staging: single_open() leaks 2013-05-05 00:15:43 -04:00
fwserial
gdm72xx USB: remove remaining instances of USB_SUSPEND 2013-05-15 13:44:44 -04:00
goldfish
iio staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe() 2013-05-22 22:14:57 +01:00
imx-drm drm: Drop all the stub gamma_get, gamma_set, load_lut functions from drivers 2013-06-17 19:42:47 +10:00
keucr
line6
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2013-06-18 06:25:08 -10:00
netlogic
nvec Staging driver fixes for 3.10-rc2 2013-05-23 09:27:49 -07:00
octeon
olpc_dcon
ozwpan
panel
phison
quickstart
rtl8187se staging: single_open() leaks 2013-05-05 00:15:43 -04:00
rtl8192e
rtl8192u staging: single_open() leaks 2013-05-05 00:15:43 -04:00
rtl8712
rts5139 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
sb105x
sbe-2t3e3
sep staging: sep: fix driver build and kconfig 2013-05-16 15:37:49 -07:00
serqt_usb2
silicom Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
slicoss
sm7xxfb
speakup staging: speakup: remove custom string_unescape_any_inplace 2013-04-30 17:04:03 -07:00
ste_rmi4 staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning 2013-05-16 15:37:49 -07:00
ti-soc-thermal
tidspbridge
usbip
vme
vt6655 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
vt6656 staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower. 2013-05-16 16:27:38 -07:00
winbond
wlags49_h2 staging: single_open() leaks 2013-05-05 00:15:43 -04:00
wlags49_h25
wlan-ng
xgifb
zcache drivers: staging: zcache: fix compile error 2013-05-30 21:14:30 +09:00
zram
zsmalloc
Kconfig staging: Swap zram and zsmalloc in Kconfig 2013-05-16 15:38:58 -07:00
Makefile
staging.c