1 files changed, 44 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 25a17b49cfe1..30677193d019 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1763,6 +1763,12 @@ M:	viro@zeniv.linux.org.uk
 L:      linux-fsdevel@vger.kernel.org
 S:      Maintained
 
+FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
+P:      Riku Voipio
+M:      riku.vipio@iki.fi
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
 P:      Kristian Hoegsberg, Stefan Richter
 M:      krh@redhat.com, stefanr@s5r6.in-berlin.de
@@ -1945,6 +1951,12 @@ L:	lm-sensors@lm-sensors.org
 W:      http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:      Maintained
 
+HYPERVISOR VIRTUAL CONSOLE DRIVER
+L:      linuxppc-dev@ozlabs.org
+L:      linux-kernel@vger.kernel.org
+S:      Odd Fixes
+F:      drivers/char/hvc_*
+
 GSPCA FINEPIX SUBDRIVER
 P:      Frank Zago
 M:      frank@zago.net
@@ -2918,6 +2930,12 @@ M:	buytenh@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
+P:      Nicolas Pitre
+M:      nico@cam.org
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
 M:      mlindner@syskonnect.de
@@ -3104,7 +3122,7 @@ M:	shemminger@linux-foundation.org
 L:      netem@lists.linux-foundation.org
 S:      Maintained
 
-NETERION (S2IO) Xframe 10GbE DRIVER
+NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
 P:      Ramkrishna Vepa
 M:      ram.vepa@neterion.com
 P:      Rastapur Santosh
@@ -3113,8 +3131,11 @@ P:	Sivakumar Subramani
 M:      sivakumar.subramani@neterion.com
 P:      Sreenivasa Honnur
 M:      sreenivasa.honnur@neterion.com
+P:      Anil Murthy
+M:      anil.murthy@neterion.com
 L:      netdev@vger.kernel.org
-W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:      Supported
 
 NETFILTER/IPTABLES/IPCHAINS
@@ -3405,6 +3426,11 @@ P:	Jim Cromie
 M:      jim.cromie@gmail.com
 S:      Maintained
 
+PCA9532 LED DRIVER
+P:      Riku Voipio
+M:      riku.voipio@iki.fi
+S:      Maintained
+
 PCI ERROR RECOVERY
 P:      Linas Vepstas
 M:      linas@austin.ibm.com
@@ -3902,7 +3928,14 @@ S:	Maintained
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 P:      Pierre Ossman
 M:      drzeus-sdhci@drzeus.cx
-L:      sdhci-devel@list.drzeus.cx
+L:      sdhci-devel@lists.ossman.eu
+S:      Maintained
+
+SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
+P:      Anton Vorontsov
+M:      avorontsov@ru.mvista.com
+L:      linuxppc-dev@ozlabs.org
+L:      sdhci-devel@lists.ossman.eu
 S:      Maintained
 
 SECURITY SUBSYSTEM
@@ -4380,6 +4413,11 @@ L:	tlinux-users@tce.toshiba-dme.co.jp
 W:      http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
+TMIO MMC DRIVER
+P:      Ian Molton
+M:      ian@mnementh.co.uk
+S:      Maintained
+
 TPM DEVICE DRIVER
 P:      Debora Velarde
 M:      debora@linux.vnet.ibm.com
@@ -4844,7 +4882,7 @@ M:	lrg@slimlogic.co.uk
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
 W:      http://opensource.wolfsonmicro.com/node/15
-W:      http://www.slimlogic.co.uk/?page_id=5
+W:      http://www.slimlogic.co.uk/?p=48
 T:      git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 S:      Supported
 
@@ -4966,7 +5004,8 @@ S:	Supported
 
 XFS FILESYSTEM
 P:      Silicon Graphics Inc
-P:      Bill O'Donnell
+P:      Felix Blyakher
+M:      felixb@sgi.com
 M:      xfs-masters@oss.sgi.com
 L:      xfs@oss.sgi.com
 W:      http://oss.sgi.com/projects/xfs