git.samba.org - ddiss/linux.git/commit

git.samba.org / ddiss / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1f49142 ba47d84)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 20 Jul 2020 07:37:31 +0000 (09:37 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 20 Jul 2020 07:37:31 +0000 (09:37 +0200)
commit	263771dbc85bc6573b344c193351980c27fd2faa
tree	0232ad4d61cb06d4d75af183b4c6d2058ba27f34	tree
parent	1f491421c4172ac6d97dcd762a07ae40f110cbac	commit \| diff
parent	ba47d845d715a010f7b51f6f89bae32845e6acb7	commit \| diff

Merge 5.8-rc6 into staging-next

We need the staging fixes in here, and it resolves a merge issue with an
iio driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/counter/104-quad-8.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/mma8452.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7780.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/adi-axi-adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/health/afe4403.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/health/afe4404.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/humidity/hdc100x.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/humidity/hts221.h	diff1 \|	diff2 \|	blob \| history
drivers/iio/humidity/hts221_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/ak8974.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/pressure/ms5611_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/pressure/zpa2326.c	diff1 \|	diff2 \|	blob \| history

ddiss' Linux kernel repository