Merge 3.18-rc4 into tty-next.

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ea4d005..424a38b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7816,6 +7816,12 @@ S:       Maintained
 F:     Documentation/serial/rocket.txt
 F:     drivers/tty/rocket*
 
+ROCKETPORT EXPRESS/INFINITY DRIVER
+M:     Kevin Cernekee <cernekee@gmail.com>
+L:     linux-serial@vger.kernel.org
+S:     Odd Fixes
+F:     drivers/tty/serial/rp2.*
+
 ROSE NETWORK LAYER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-hams@vger.kernel.org