git.cascardo.info Git - cascardo/linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 3 Nov 2014 02:06:03 +0000 (18:06 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 3 Nov 2014 02:06:03 +0000 (18:06 -0800)
commit	7cbe010a5ea728d7c4440b11a1a3997faca0e46d
tree	9132c4c60a236f58f532086a0d8b8cc3fdf180fc	tree \| snapshot
parent	9056be30542bfff51190bdda67088f319cf4c9f5	commit \| diff
parent	0df1f2487d2f0d04703f142813d53615d62a1da4	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/mxs-lradc.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history