www.infradead.org Git - users/hch/misc.git/commit

]> www.infradead.org Git - users/hch/misc.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 May 2025 08:13:06 +0000 (18:13 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 May 2025 08:13:06 +0000 (18:13 +1000)
commit	ebbd5e39d0dd3afcb2b0285de49164148068bd05
tree	2742345903ff2dd61bde875d4ec191bedfed8ed4	tree
parent	39661628364223a109dc612ea2d8abedcafa6d9e	commit \| diff
parent	d820bea88e277acc38b011fde9a8dc9f5310a6b9	commit \| diff

Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git

# Conflicts:
# drivers/iio/adc/ad7606.c

23 files changed:

Documentation/devicetree/bindings/vendor-prefixes.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/base/property.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/adxl355_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/fxls8962af-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7266.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7380.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7606.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7606_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7768-1.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/dln2-adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/rockchip_saradc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/chemical/pms7003.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/chemical/sps30.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/dac/adi-axi-dac.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/hid-sensor-prox.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/ak8974.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/temperature/maxim_thermocouple.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/ad7816.c	diff1 \|	diff2 \|	blob \| history
include/linux/property.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

Documentation/devicetree/bindings/vendor-prefixes.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/base/property.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/adxl355_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/fxls8962af-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7266.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7380.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7606.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7606_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7768-1.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/dln2-adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/rockchip_saradc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/chemical/pms7003.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/chemical/sps30.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/dac/adi-axi-dac.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/hid-sensor-prox.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/ak8974.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/temperature/maxim_thermocouple.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/ad7816.c	diff1 \|	diff2 \|	blob \| history
include/linux/property.h	diff1 \|	diff2 \|	blob \| history