git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 6 Dec 2017 14:27:17 +0000 (15:27 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 6 Dec 2017 14:27:17 +0000 (15:27 +0100)
commit	e8cd29b774ddd28bfe6d693c82241e294dc91e09
tree	c8f904220eab7c50771558642b6c6d9240fb5368	tree
parent	7e739297cdbe8383bf4a5e423959107eccc01fa1	commit \| diff
parent	73996933b53ff396d63a7fccd8e824758634dc19	commit \| diff

Merge Linus's staging merge point into staging-next

This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/meson_saradc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/health/max30102.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/proximity/sx9500.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ccree/ssi_hash.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_atmio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ncpfs/inode.c	diff1 \|	diff2 \|	blob \| history