Merge 3.18-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Nov 2014 02:06:03 +0000 (18:06 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Nov 2014 02:06:03 +0000 (18:06 -0800)
commit7cbe010a5ea728d7c4440b11a1a3997faca0e46d
tree9132c4c60a236f58f532086a0d8b8cc3fdf180fc
parent9056be30542bfff51190bdda67088f319cf4c9f5
parent0df1f2487d2f0d04703f142813d53615d62a1da4
Merge 3.18-rc3 into staging-next

We want the upstream fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/comedi/Kconfig
drivers/staging/comedi/comedi_fops.c
drivers/staging/iio/adc/mxs-lradc.c
include/uapi/linux/Kbuild