Merge 4.18-rc3 into staging-next

author Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)

committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)
author Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
Simple merge
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 2 Jul 2018 06:21:54 +0000 (08:21 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	patch \|	diff1 \|	diff2 \|	blob \| history