diff --git a/[refs] b/[refs] index 4dc8c3668214..b1ae53e0a408 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1aa4bed82a684308f54bf782cffaecd4b1dc3cf4 +refs/heads/master: dc9879291be479e096c5cfac33effc2ade74309b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 2cb7566904b1..09f6b3e5708a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -157,9 +157,10 @@ S: Maintained F: drivers/net/r8169.c 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER +P: Alan Cox +M: alan@lxorguk.ukuu.org.uk L: linux-serial@vger.kernel.org W: http://serial.sourceforge.net -M: alan@lxorguk.ukuu.org.uk S: Odd Fixes F: drivers/serial/8250* F: include/linux/serial_8250.h