diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 08:16:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 08:16:31 +0100 |
| commit | 525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4 (patch) | |
| tree | c4a9e8ebaf299e5baef11cc0893580e8804abbe8 /scripts/lib/kdoc/kdoc_parser.py | |
| parent | b331a3d8097fad4e541d212684192f21fedbd6e5 (diff) | |
| parent | 80e54e84911a923c40d7bee33a34c1b4be148d7a (diff) | |
Merge v6.14-rc6 into usb-next
Resolves the merge conflict with:
drivers/usb/typec/ucsi/ucsi_acpi.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_parser.py')
0 files changed, 0 insertions, 0 deletions