]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge 6.13-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2025 05:17:49 +0000 (06:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2025 05:17:49 +0000 (06:17 +0100)
commitbe887fcad3f18031232eabcb398d009a3fc3ef61
tree2b9419417e66e3b073cc157682f10c63285f16d1
parent44cefdf1cc6d1b912eca6004012e587174e32eeb
parent5bc55a333a2f7316b58edc7573e8e893f7acb532
Merge 6.13-rc4 into char-misc-next

We need the IIO fixes in here as well, and it resolves a merge conflict
in:
drivers/iio/adc/ti-ads1119.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/bus/mhi/host/pci_generic.c
drivers/iio/adc/ad4695.c
drivers/iio/adc/ad7124.c
drivers/iio/adc/ad7173.c
drivers/iio/adc/rockchip_saradc.c
drivers/iio/adc/ti-ads1119.c
drivers/iio/inkern.c
drivers/iio/light/bh1745.c
drivers/iio/temperature/tmp006.c
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c