Merge 5.7-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 May 2020 07:11:19 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 May 2020 07:11:19 +0000 (09:11 +0200)
We need the staging/iio fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/chemical/atlas-sensor.c
drivers/iio/dac/vf610_dac.c
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
drivers/staging/greybus/uart.c
drivers/staging/wfx/scan.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge