Merge 3.10-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
commit829455bb0e994373519e3c58d403fc1148f44630
tree7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a
parent42b4212baa28ebb07147c1de3990c596e7612e97
parente4aa937ec75df0eea0bee03bffa3303ad36c986b
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>
MAINTAINERS
drivers/iio/adc/exynos_adc.c
drivers/staging/Kconfig
drivers/staging/comedi/comedi_buf.c
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/comedi/drivers/ni_labpc.h
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/dwc2/hcd_intr.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/imx-drm/imx-tve.c