projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56686ac 9365f0d)
Merge commit '9365f0de4303f82ed4c2db1c39d3de824b249d80' into HEAD
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 9 Nov 2024 10:39:52 +0000 (10:39 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 9 Nov 2024 10:39:52 +0000 (10:39 +0000)
Merge v6.12-rc6 via char-misc-next to get some fixes needed for next few
patches in IIO.

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/iio/dac/Kconfig patch | diff1 | diff2 | blob | history
drivers/iio/light/veml6030.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/iio/dac/Kconfig
Simple merge
diff --cc drivers/iio/light/veml6030.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.