diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-13 06:17:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-13 06:17:49 +0100 |
| commit | be887fcad3f18031232eabcb398d009a3fc3ef61 (patch) | |
| tree | 2b9419417e66e3b073cc157682f10c63285f16d1 /scripts/lib/kdoc/kdoc_files.py | |
| parent | Merge tag 'mhi-for-v6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next (diff) | |
| parent | Linux 6.13-rc7 (diff) | |
| download | linux-rng-be887fcad3f18031232eabcb398d009a3fc3ef61.tar.xz linux-rng-be887fcad3f18031232eabcb398d009a3fc3ef61.zip | |
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>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_files.py')
0 files changed, 0 insertions, 0 deletions