Merge branch 'mainline' into upstream-linus

1 files changed, 34 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index efc33baa49ba..9c9385e10342 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -298,6 +298,14 @@ L:	info-linux@geode.amd.com
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
+AMSO1100 RNIC DRIVER
+P:      Tom Tucker
+M:      tom@opengridcomputing.com
+P:      Steve Wise
+M:      swise@opengridcomputing.com
+L:      openib-general@openib.org
+S:      Maintained
+
 AOA (Apple Onboard Audio) ALSA DRIVER
 P:      Johannes Berg
 M:      johannes@sipsolutions.net
@@ -416,7 +424,7 @@ S:	Supported
 ATM
 P:      Chas Williams
 M:      chas@cmf.nrl.navy.mil
-L:      linux-atm-general@lists.sourceforge.net
+L:      linux-atm-general@lists.sourceforge.net (subscribers-only)
 W:      http://linux-atm.sourceforge.net
 S:      Maintained
 
@@ -991,6 +999,14 @@ EFS FILESYSTEM
 W:      http://aeschi.ch.eu.org/efs/
 S:      Orphan
 
+EHCA (IBM GX bus InfiniBand adapter) DRIVER:
+P:      Hoang-Nam Nguyen
+M:      hnguyen@de.ibm.com
+P:      Christoph Raisch
+M:      raisch@de.ibm.com
+L:      openib-general@openib.org
+S:      Supported
+
 EMU10K1 SOUND DRIVER
 P:      James Courtier-Dutton
 M:      James@superbug.demon.co.uk
@@ -1766,6 +1782,13 @@ W:     http://www.penguinppc.org/
 L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
 
+LINUX FOR POWERPC PA SEMI PWRFICIENT
+P:      Olof Johansson
+M:      olof@lixom.net
+W:      http://www.pasemi.com/
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
 LLC (802.2)
 P:      Arnaldo Carvalho de Melo
 M:      acme@conectiva.com.br
@@ -2428,6 +2451,8 @@ S:      Maintained
 S390
 P:      Martin Schwidefsky
 M:      schwidefsky@de.ibm.com
+P:      Heiko Carstens
+M:      heiko.carstens@de.ibm.com
 M:      linux390@de.ibm.com
 L:      linux-390@vm.marist.edu
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -2793,6 +2818,14 @@ M:	hadi@cyberus.ca
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+TCP LOW PRIORITY MODULE
+P:      Wong Hoi Sing, Edison
+M:      hswong3i@gmail.com
+P:      Hung Hing Lun, Mike
+M:      hlhung3i@gmail.com
+W:      http://tcp-lp-mod.sourceforge.net/
+S:      Maintained
+
 TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net