]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge 5.9-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Sep 2020 04:57:52 +0000 (06:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Sep 2020 04:57:52 +0000 (06:57 +0200)
We want the staging/iio changes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/accel/mma8452.c
drivers/iio/adc/Kconfig
drivers/iio/adc/meson_saradc.c
drivers/iio/adc/ti-adc081c.c
drivers/iio/dac/dpot-dac.c
drivers/iio/health/max30102.c
drivers/iio/industrialio-core.c
drivers/iio/magnetometer/ak8974.c

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