]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge staging-next tree into Linus's latest version
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 May 2010 19:48:55 +0000 (12:48 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 May 2010 19:48:55 +0000 (12:48 -0700)
commitc8d1a126924fcbc1d61ceb830226e0c7afdcc841
treed3f3c850481c33b7f433175e83a189f958b1b868
parentd7dbf4ffee1c7a17e2e5b5f01efe76fbd1671db6
parent107c161b7ddeeb7da43509cc6b29211885ccd9af
Merge staging-next tree into Linus's latest version

Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
31 files changed:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/das08_cs.c
drivers/staging/comedi/drivers/ni_daq_700.c
drivers/staging/comedi/drivers/ni_daq_dio24.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/quatech_daqp_cs.c
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-video-upstream.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/hv/rndis_filter.c
drivers/staging/iio/accel/lis3l02dq_ring.c
drivers/staging/iio/adc/max1363_core.c
drivers/staging/iio/industrialio-core.c
drivers/staging/iio/light/tsl2563.c
drivers/staging/rt2860/usb_main_dev.c
drivers/staging/rtl8192su/r8192U_core.c
drivers/staging/udlfb/udlfb.c
drivers/staging/usbip/stub_rx.c
drivers/staging/vme/bridges/vme_tsi148.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6655/rxtx.c
drivers/staging/vt6656/main_usb.c
drivers/staging/vt6656/rxtx.c
drivers/staging/winbond/wbusb.c
drivers/staging/wlags49_h2/wl_cs.c
drivers/staging/wlags49_h2/wl_netdev.c