git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d82be8 1e28eed)
Merge 5.12-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 07:43:49 +0000 (08:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 07:43:49 +0000 (08:43 +0100)
commit280def1e1c17d35b21206881937d4498bcc1f503
tree6e40d88144f06dce56338c60073b85b36207f1eftree
parent3d82be8be6fdf38543fa3ae9c35beda4a8a8d067commit | diff
parent1e28eed17697bcf343c6743f0028cc3b5dd88bf0commit | 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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/hamradio/6pack.c diff1 | diff2 | blob | history
drivers/tty/hvc/hvcs.c diff1 | diff2 | blob | history
drivers/tty/tty_io.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.