diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 10:02:49 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 10:02:49 +0100 |
commit | cb05c6c82fb0853b53ecf983c29ab02aaca13194 (patch) | |
tree | e6316ab7e1625a550079803e8f80ab3f327448a9 /lib/uuid.c | |
parent | tty: mips_ejtag_fdc: Mark expected switch fall-through (diff) | |
parent | Linux 5.6-rc5 (diff) | |
download | linux-cb05c6c82fb0853b53ecf983c29ab02aaca13194.tar.xz linux-cb05c6c82fb0853b53ecf983c29ab02aaca13194.zip |
Merge 5.6-rc5 into tty-next
We need the vt fixes in here and it resolves a merge issue with
drivers/tty/vt/selection.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/uuid.c')
0 files changed, 0 insertions, 0 deletions