Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 03:17:12 +0000 (14:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 03:17:12 +0000 (14:17 +1100)
commitb13002c5fa44fb8ea14b88df7677ec75ce6f709c
treed83b5e5c5e02b635d64bdc49b3a354f41576b7b7
parentfb13686d63a608a8e0f96eeba2f34b5fe2985173
parent342c6c5e2260875e0716a9f798dd89da431e679f
Merge branch 'togreg' of git://git./linux/kernel/git/jic23/iio.git

# Conflicts:
# .mailmap
.mailmap
MAINTAINERS
drivers/iio/adc/ti-tsc2046.c
drivers/iio/frequency/adf4350.c
drivers/iio/frequency/admv1013.c
drivers/iio/industrialio-buffer.c