Merge 3.10-rc3 into staging-next

We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/exynos_adc.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/comedi/comedi_buf.c
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_labpc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_labpc.h
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_mio_common.c
Simple merge

diff --cc drivers/staging/dwc2/hcd_intr.c
Simple merge

diff --cc drivers/staging/iio/adc/mxs-lradc.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-tve.c
Simple merge