Merge remote-tracking branch 'staging/staging-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/iio/adc/Kconfig
Simple merge
diff --cc drivers/iio/adc/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 8 Feb 2019 04:40:39 +0000 (15:40 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history