diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-23 15:25:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-23 15:25:46 +0100 |
| commit | 54573f3ef96bfa346c62b6ce7835c6691c844fe6 (patch) | |
| tree | 2e450b3059857249e659f5996abffbc2941dee19 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | 2636455b28cb477a1b74c570023ac505ff1a3890 (diff) | |
| parent | 2241ab53cbb5cdb08a6b2d4688feb13971058f65 (diff) | |
Merge 6.2-rc5 into staging-next
We need the staging fixes in here, and it resolves a merge conflict in:
drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
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