diff --git a/[refs] b/[refs] index 39a69eb97bfb..1ac39198bd6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 658874f05d040ca96eb5ba9b1c30ce0ff287d762 +refs/heads/master: 90a09c9cf78344d18e2438c3b87363b949629fa3 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 66a3865da88d..79471ba4981b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -155,10 +155,9 @@ S: Maintained F: drivers/net/r8169.c 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER -M: Alan Cox L: linux-serial@vger.kernel.org W: http://serial.sourceforge.net -S: Odd Fixes +S: Orphan F: drivers/serial/8250* F: include/linux/serial_8250.h @@ -4997,9 +4996,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git S: Maintained TTY LAYER -M: Alan Cox -S: Maintained -T: stgit http://zeniv.linux.org.uk/~alan/ttydev/ +S: Orphan F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h