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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/comedi/Kconfig
Simple merge

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

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

diff --cc include/uapi/linux/Kbuild
Simple merge