diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:33:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:33:30 +0100 |
| commit | 924fb3ec50f5156d21e4f484358fb36f75b91ca8 (patch) | |
| tree | f36b768432fe7f7c07b28857533e1bfe16006abe /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | usb: remove the dead USB_OHCI_SH option (diff) | |
| parent | Linux 6.2-rc7 (diff) | |
| download | linux-924fb3ec50f5156d21e4f484358fb36f75b91ca8.tar.gz linux-924fb3ec50f5156d21e4f484358fb36f75b91ca8.zip | |
Merge 6.2-rc7 into usb-next
We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions