1 files changed, 25 insertions, 21 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 649600cb8ec9..ec3600306289 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -184,10 +184,9 @@ F:	Documentation/filesystems/9p.txt
 F:      fs/9p/
 
 A2232 SERIAL BOARD DRIVER
-M:      Enver Haase <A2232@gmx.net>
 L:      linux-m68k@lists.linux-m68k.org
-S:      Maintained
-F:      drivers/char/ser_a2232*
+S:      Orphan
+F:      drivers/staging/generic_serial/ser_a2232*
 
 AACRAID SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
@@ -877,6 +876,13 @@ F:	arch/arm/mach-mv78xx0/
 F:      arch/arm/mach-orion5x/
 F:      arch/arm/plat-orion/
 
+ARM/Orion SoC/Technologic Systems TS-78xx platform support
+M:      Alexander Clouter <alex@digriz.org.uk>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:      http://www.digriz.org.uk/ts78xx/kernel
+S:      Maintained
+F:      arch/arm/mach-orion5x/ts78xx-*
+
 ARM/MIOA701 MACHINE SUPPORT
 M:      Robert Jarzmik <robert.jarzmik@free.fr>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1063,7 +1069,7 @@ F:	arch/arm/mach-shmobile/
 F:      drivers/sh/
 
 ARM/TELECHIPS ARM ARCHITECTURE
-M:      "Hans J. Koch" <hjk@linutronix.de>
+M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/plat-tcc/
@@ -1823,11 +1829,10 @@ S:	Maintained
 F:      drivers/platform/x86/compal-laptop.c
 
 COMPUTONE INTELLIPORT MULTIPORT CARD
-M:      "Michael H. Warfield" <mhw@wittsend.com>
 W:      http://www.wittsend.com/computone.html
-S:      Maintained
+S:      Orphan
 F:      Documentation/serial/computone.txt
-F:      drivers/char/ip2/
+F:      drivers/staging/tty/ip2/
 
 CONEXANT ACCESSRUNNER USB DRIVER
 M:      Simon Arlott <cxacru@fire.lp0.eu>
@@ -2010,7 +2015,7 @@ F:	drivers/net/wan/cycx*
 CYCLADES ASYNC MUX DRIVER
 W:      http://www.cyclades.com/
 S:      Orphan
-F:      drivers/char/cyclades.c
+F:      drivers/tty/cyclades.c
 F:      include/linux/cyclades.h
 
 CYCLADES PC300 DRIVER
@@ -2124,8 +2129,8 @@ L:	Eng.Linux@digi.com
 W:      http://www.digi.com
 S:      Orphan
 F:      Documentation/serial/digiepca.txt
-F:      drivers/char/epca*
-F:      drivers/char/digi*
+F:      drivers/staging/tty/epca*
+F:      drivers/staging/tty/digi*
 
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <guenter.roeck@ericsson.com>
@@ -4077,7 +4082,7 @@ F:	drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
-M:      "Hans J. Koch" <hjk@linutronix.de>
+M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      Documentation/hwmon/max6650
@@ -4192,7 +4197,7 @@ MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 M:      Jiri Slaby <jirislaby@gmail.com>
 S:      Maintained
 F:      Documentation/serial/moxa-smartio
-F:      drivers/char/mxser.*
+F:      drivers/tty/mxser.*
 
 MSI LAPTOP SUPPORT
 M:      "Lee, Chun-Yi" <jlee@novell.com>
@@ -4234,7 +4239,7 @@ F:	sound/oss/msnd*
 
 MULTITECH MULTIPORT CARD (ISICOM)
 S:      Orphan
-F:      drivers/char/isicom.c
+F:      drivers/tty/isicom.c
 F:      include/linux/isicom.h
 
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
@@ -5273,14 +5278,14 @@ F:	drivers/memstick/host/r592.*
 RISCOM8 DRIVER
 S:      Orphan
 F:      Documentation/serial/riscom8.txt
-F:      drivers/char/riscom8*
+F:      drivers/staging/tty/riscom8*
 
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
 W:      http://www.comtrol.com
 S:      Maintained
 F:      Documentation/serial/rocket.txt
-F:      drivers/char/rocket*
+F:      drivers/tty/rocket*
 
 ROSE NETWORK LAYER
 M:      Ralf Baechle <ralf@linux-mips.org>
@@ -5916,10 +5921,9 @@ F:	arch/arm/mach-spear6xx/spear600.c
 F:      arch/arm/mach-spear6xx/spear600_evb.c
 
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
-M:      Roger Wolff <R.E.Wolff@BitWizard.nl>
-S:      Supported
+S:      Orphan
 F:      Documentation/serial/specialix.txt
-F:      drivers/char/specialix*
+F:      drivers/staging/tty/specialix*
 
 SPI SUBSYSTEM
 M:      David Brownell <dbrownell@users.sourceforge.net>
@@ -5964,7 +5968,6 @@ F:	arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
 M:      Greg Kroah-Hartman <greg@kroah.com>
-M:      Chris Wright <chrisw@sous-sol.org>
 L:      stable@kernel.org
 S:      Maintained
 
@@ -6248,7 +6251,8 @@ M:	Greg Ungerer <gerg@uclinux.org>
 W:      http://www.uclinux.org/
 L:      uclinux-dev@uclinux.org  (subscribers-only)
 S:      Maintained
-F:      arch/m68knommu/
+F:      arch/m68k/*/*_no.*
+F:      arch/m68k/include/asm/*_no.*
 
 UCLINUX FOR RENESAS H8/300 (H8300)
 M:      Yoshinori Sato <ysato@users.sourceforge.jp>
@@ -6618,7 +6622,7 @@ F:	fs/hostfs/
 F:      fs/hppfs/
 
 USERSPACE I/O (UIO)
-M:      "Hans J. Koch" <hjk@linutronix.de>
+M:      "Hans J. Koch" <hjk@hansjkoch.de>
 M:      Greg Kroah-Hartman <gregkh@suse.de>
 S:      Maintained
 F:      Documentation/DocBook/uio-howto.tmpl