Merge 5.7-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Apr 2020 10:20:40 +0000 (12:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Apr 2020 10:20:40 +0000 (12:20 +0200)
commite8014d83f60479d3981baeaa3a21c993ff832f3f
tree90af78aea1a518c4c04d123e1473e8c4c729c221
parent41aef04524d3dc8c2a5d9652cccc1f567356b5fd
parent6a8b55ed4056ea5559ebe4f6a4b247f627870d4c
Merge 5.7-rc3 into staging-next

We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/adc/ad7793.c
drivers/iio/adc/xilinx-xadc-core.c
drivers/iio/common/st_sensors/st_sensors_core.c
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
drivers/iio/industrialio-core.c
drivers/staging/gasket/gasket_sysfs.c
drivers/staging/vt6656/main_usb.c
include/linux/iio/iio.h