Merge commit '71b25f4df984' from tty/tty-next
authorHector Martin <marcan@marcan.st>
Thu, 8 Apr 2021 10:17:19 +0000 (19:17 +0900)
committerHector Martin <marcan@marcan.st>
Thu, 8 Apr 2021 10:17:33 +0000 (19:17 +0900)
commitfd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d
treed417b1a0b9db925fc791393bdfeee2099ef32028
parent1e28eed17697bcf343c6743f0028cc3b5dd88bf0
parent71b25f4df9849799d84d9345c636aac097316052
Merge commit '71b25f4df984' from tty/tty-next

This point in gregkh's tty-next tree includes all the samsung_tty
changes that were part of v3 of the M1 bring-up series, and have
already been merged in.

Signed-off-by: Hector Martin <marcan@marcan.st>
MAINTAINERS
drivers/net/hamradio/6pack.c
drivers/tty/hvc/hvcs.c
drivers/tty/tty_io.c