1 files changed, 43 insertions, 20 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b64776c4aeea..391d57eec003 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)
@@ -557,6 +567,13 @@ S:	Maintained
 F:      drivers/net/appletalk/
 F:      net/appletalk/
 
+ARASAN COMPACT FLASH PATA CONTROLLER
+M:      Viresh Kumar <viresh.kumar@st.com>
+L:      linux-ide@vger.kernel.org
+S:      Maintained
+F:      include/linux/pata_arasan_cf_data.h
+F:      drivers/ata/pata_arasan_cf.c
+
 ARC FRAMEBUFFER DRIVER
 M:      Jaya Kumar <jayalk@intworks.biz>
 S:      Maintained
@@ -1214,7 +1231,7 @@ ATHEROS AR9170 WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@web.de>
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/ar9170
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/ath/ar9170/
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
@@ -1710,6 +1727,7 @@ S:	Maintained
 F:      Documentation/zh_CN/
 
 CISCO VIC ETHERNET NIC DRIVER
+M:      Christian Benvenuti <benve@cisco.com>
 M:      Vasanthy Kolluri <vkolluri@cisco.com>
 M:      Roopa Prabhu <roprabhu@cisco.com>
 M:      David Wang <dwang2@cisco.com>
@@ -2826,7 +2844,7 @@ F:	mm/hwpoison-inject.c
 HYPERVISOR VIRTUAL CONSOLE DRIVER
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Odd Fixes
-F:      drivers/char/hvc_*
+F:      drivers/tty/hvc/
 
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
@@ -3441,7 +3459,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>
@@ -3596,12 +3614,6 @@ W:	http://lse.sourceforge.net/kdump/
 S:      Maintained
 F:      Documentation/kdump/
 
-KERNEL AUTOMOUNTER (AUTOFS)
-M:      "H. Peter Anvin" <hpa@zytor.com>
-L:      autofs@linux.kernel.org
-S:      Obsolete
-F:      drivers/staging/autofs/
-
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
 L:      autofs@linux.kernel.org
@@ -4292,10 +4304,7 @@ S:	Maintained
 F:      net/sched/sch_netem.c
 
 NETERION 10GbE DRIVERS (s2io/vxge)
-M:      Ramkrishna Vepa <ramkrishna.vepa@exar.com>
-M:      Sivakumar Subramani <sivakumar.subramani@exar.com>
-M:      Sreenivasa Honnur <sreenivasa.honnur@exar.com>
-M:      Jon Mason <jon.mason@exar.com>
+M:      Jon Mason <jdmason@kudzu.us>
 L:      netdev@vger.kernel.org
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@ -4898,6 +4907,15 @@ S:	Maintained
 F:      drivers/block/pktcdvd.c
 F:      include/linux/pktcdvd.h
 
+PKUNITY SOC DRIVERS
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      drivers/input/serio/i8042-unicore32io.h
+F:      drivers/i2c/busses/i2c-puv3.c
+F:      drivers/video/fb-puv3.c
+
 PMC SIERRA MaxRAID DRIVER
 M:      Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:      linux-scsi@vger.kernel.org
@@ -5161,6 +5179,7 @@ RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
 M:      Ivo van Doorn <IvDoorn@gmail.com>
 M:      Gertjan van Wingerde <gwingerde@gmail.com>
+M:      Helmut Schaa <helmut.schaa@googlemail.com>
 L:      linux-wireless@vger.kernel.org
 L:      users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:      http://rt2x00.serialmonkey.com/
@@ -5340,8 +5359,7 @@ S:	Supported
 F:      drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:      Christof Schmitt <christof.schmitt@de.ibm.com>
-M:      Swen Schillig <swen@vnet.ibm.com>
+M:      Steffen Maier <maier@linux.vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -6085,13 +6103,11 @@ F:	sound/soc/codecs/twl4030*
 TIPC NETWORK LAYER
 M:      Jon Maloy <jon.maloy@ericsson.com>
 M:      Allan Stephens <allan.stephens@windriver.com>
-L:      tipc-discussion@lists.sourceforge.net
+L:      netdev@vger.kernel.org (core kernel code)
+L:      tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 W:      http://tipc.sourceforge.net/
-W:      http://tipc.cslab.ericsson.net/
-T:      git git://tipc.cslab.ericsson.net/pub/git/tipc.git
 S:      Maintained
 F:      include/linux/tipc*.h
-F:      include/net/tipc/
 F:      net/tipc/
 
 TILE ARCHITECTURE
@@ -6099,7 +6115,7 @@ M:	Chris Metcalf <cmetcalf@tilera.com>
 W:      http://www.tilera.com/scm/
 S:      Supported
 F:      arch/tile/
-F:      drivers/char/hvc_tile.c
+F:      drivers/tty/hvc/hvc_tile.c
 F:      drivers/net/tile/
 
 TLAN NETWORK DRIVER
@@ -6263,6 +6279,13 @@ F:	drivers/uwb/
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
+UNICORE32 ARCHITECTURE:
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      arch/unicore32/
+
 UNIFDEF
 M:      Tony Finch <dot@dotat.at>
 W:      http://dotat.at/prog/unifdef