diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:19 +0900 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:33 +0900 |
| commit | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (patch) | |
| tree | d417b1a0b9db925fc791393bdfeee2099ef32028 /MAINTAINERS | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| parent | 71b25f4df9849799d84d9345c636aac097316052 (diff) | |
| download | linux-stable-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.tar.gz linux-stable-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.tar.bz2 linux-stable-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.zip | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa84121c5611..88ad851fb5da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4876,16 +4876,8 @@ S: Maintained W: http://www.armlinux.org.uk/ F: drivers/video/fbdev/cyber2000fb.* -CYCLADES ASYNC MUX DRIVER -S: Orphan -W: http://www.cyclades.com/ -F: drivers/tty/cyclades.c -F: include/linux/cyclades.h -F: include/uapi/linux/cyclades.h - CYCLADES PC300 DRIVER S: Orphan -W: http://www.cyclades.com/ F: drivers/net/wan/pc300* CYPRESS_FIRMWARE MEDIA DRIVER @@ -12089,8 +12081,7 @@ F: drivers/media/pci/meye/ F: include/uapi/linux/meye.h MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD -M: Jiri Slaby <jirislaby@kernel.org> -S: Maintained +S: Orphan F: Documentation/driver-api/serial/moxa-smartio.rst F: drivers/tty/mxser.* @@ -12234,11 +12225,6 @@ F: drivers/mux/ F: include/dt-bindings/mux/ F: include/linux/mux/ -MULTITECH MULTIPORT CARD (ISICOM) -S: Orphan -F: drivers/tty/isicom.c -F: include/linux/isicom.h - MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER M: Bin Liu <b-liu@ti.com> L: linux-usb@vger.kernel.org @@ -15409,12 +15395,6 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/rocker/ -ROCKETPORT DRIVER -S: Maintained -W: http://www.comtrol.com -F: Documentation/driver-api/serial/rocket.rst -F: drivers/tty/rocket* - ROCKETPORT EXPRESS/INFINITY DRIVER M: Kevin Cernekee <cernekee@gmail.com> L: linux-serial@vger.kernel.org |