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 /lib/mpi/mpi-sub-ui.c | |
| parent | xhci: Handle spurious events on Etron host isoc enpoints (diff) | |
| parent | Linux 6.14-rc6 (diff) | |
| download | wireguard-linux-525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4.tar.xz wireguard-linux-525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4.zip | |
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 'lib/mpi/mpi-sub-ui.c')
0 files changed, 0 insertions, 0 deletions