diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-20 09:14:37 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-20 09:14:37 +0100 |
commit | f16a70c0472ea4cda3ab53fd3b5d2fa5628fb2c7 (patch) | |
tree | d4cc4eacbe86b093d0425236afb7118b3f104345 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | 15ac1122fd6d4bf408a03e6f23c7ad4f60b22f9e (diff) | |
parent | e8d018dd0257f744ca50a729e3d042cf2ec9da65 (diff) |
Merge 6.3-rc3 into tty-next
We need the tty/serial fixes in here and it resolves a merge conflict
with:
drivers/tty/serial/8250/8250_em.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions