Merge tag 'tty-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d52eae7..434a43d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2121,11 +2121,6 @@ M:       Ludovic Desroches <ludovic.desroches@atmel.com>
 S:     Maintained
 F:     drivers/mmc/host/atmel-mci.c
 
-ATMEL AT91 / AT32 SERIAL DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
-S:     Supported
-F:     drivers/tty/serial/atmel_serial.c
-
 ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
@@ -7774,6 +7769,12 @@ T:       git git://git.monstr.eu/linux-2.6-microblaze.git
 S:     Supported
 F:     arch/microblaze/
 
+MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
+M:     Richard Genoud <richard.genoud@gmail.com>
+S:     Maintained
+F:     drivers/tty/serial/atmel_serial.c
+F:     include/linux/atmel_serial.h
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:     Chen Yu <yu.c.chen@intel.com>
 L:     platform-driver-x86@vger.kernel.org