diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:43:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:43:49 +0100 |
| commit | 280def1e1c17d35b21206881937d4498bcc1f503 (patch) | |
| tree | 6e40d88144f06dce56338c60073b85b36207f1ef /tools/perf/tests/parse-events.c | |
| parent | 3d82be8be6fdf38543fa3ae9c35beda4a8a8d067 (diff) | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
Merge 5.12-rc3 into tty-next
Resolves a merge issue with:
drivers/tty/hvc/hvcs.c
and we want the tty/serial fixes from 5.12-rc3 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/tests/parse-events.c')
0 files changed, 0 insertions, 0 deletions