Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 04:54:17 +0000 (15:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 04:54:17 +0000 (15:54 +1100)
commit7198d1ff1d61b672c854b7ebaba2baaf450cf6ec
treed50edb86b25d04f2e97776869efbecb2995daf89
parente7f6afe2cf9f805266dfef6b699f7735eded6ef2
parentd4ab5487cc77a4053dc9070c5761ad94bf397825
Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty.git

# Conflicts:
# MAINTAINERS
MAINTAINERS
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
drivers/tty/serial/max3100.c
drivers/tty/serial/sc16is7xx.c
drivers/tty/serial/sh-sci.c