diff options
| author | Greg Kroah-Hartman <[email protected]> | 2023-05-28 15:25:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2023-05-28 15:25:53 +0100 |
| commit | 7e530d32a3655f15f1cf92e8aabed1bc3a21ee36 (patch) | |
| tree | 7d6cb1cc6588e0cb1b65bf8d1c610b0ca3cb04de /tools/perf/scripts/python | |
| parent | 19b3cf44e18c202d696354d1947b9a74fbad046e (diff) | |
| parent | 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 (diff) | |
Merge 6.4-rc4 into usb-next
We need the USB fixes in here and this resolves merge conflicts in:
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/udc/core.c
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions