diff options
| author | Greg Kroah-Hartman <[email protected]> | 2023-01-23 15:38:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2023-01-23 15:38:08 +0100 |
| commit | e3e9fc7fa7ad221cc2e7b207d514cc84ed393251 (patch) | |
| tree | 7de34df1844075bd3ed0391546d74ae9dab5fcae /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | dd2f003e4e85b154754d5a83e0c3b1b517d1f802 (diff) | |
| parent | 2241ab53cbb5cdb08a6b2d4688feb13971058f65 (diff) | |
Merge 6.2-rc5 into usb-next
We need the USB fixes in here and this resolves merge conflicts as
reported in linux-next in the following files:
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/typec/ucsi/ucsi.c
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions