1 files changed, 11 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f99e1260db..5099856ee15 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -465,6 +465,16 @@ M:	Matt Turner <mattst88@gmail.com>
 L:      linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
+ALTERA UART/JTAG UART SERIAL DRIVERS
+M:      Tobias Klauser <tklauser@distanz.ch>
+L:      linux-serial@vger.kernel.org
+L:      nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/tty/serial/altera_uart.c
+F:      drivers/tty/serial/altera_jtaguart.c
+F:      include/linux/altera_uart.h
+F:      include/linux/altera_jtaguart.h
+
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 M:      Thomas Dahlmann <dahlmann.thomas@arcor.de>
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
@@ -3424,7 +3434,7 @@ M:	Jiri Kosina <jkosina@suse.cz>
 M:      David Sterba <dsterba@suse.cz>
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-F:      drivers/char/pcmcia/ipwireless/
+F:      drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>