Merge git://git.infradead.org/battery-2.6

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 83e9195e8c9c9f7ce62e3816a690ce5fa0173068..391426977826a00047429f243eadc9aab0c0a4ce 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -370,7 +370,7 @@ P:  Tom Tucker
 M:     tom@opengridcomputing.com
 P:     Steve Wise
 M:     swise@opengridcomputing.com
-L:     openib-general@openib.org
+L:     general@lists.openfabrics.org
 S:     Maintained
 
 AOA (Apple Onboard Audio) ALSA DRIVER
@@ -1395,7 +1395,7 @@ P:        Hoang-Nam Nguyen
 M:     hnguyen@de.ibm.com
 P:     Christoph Raisch
 M:     raisch@de.ibm.com
-L:     openib-general@openib.org
+L:     general@lists.openfabrics.org
 S:     Supported
 
 EMU10K1 SOUND DRIVER
@@ -1849,8 +1849,8 @@ M:        rolandd@cisco.com
 P:     Sean Hefty
 M:     mshefty@ichips.intel.com
 P:     Hal Rosenstock
-M:     halr@voltaire.com
-L:     openib-general@openib.org
+M:     hal.rosenstock@gmail.com 
+L:     general@lists.openfabrics.org
 W:     http://www.openib.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
@@ -1988,9 +1988,10 @@ M:       jjciarla@raiz.uncu.edu.ar
 S:     Maintained
 
 IPATH DRIVER:
-P:     Bryan O'Sullivan
-M:     support@pathscale.com
-L:     openib-general@openib.org
+P:     Arthur Jones
+M:     infinipath@qlogic.com
+L:     general@lists.openfabrics.org
+T:     git git://git.qlogic.com/ipath-linux-2.6
 S:     Supported
 
 IPMI SUBSYSTEM
@@ -2329,6 +2330,12 @@ W:       http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
 S:     Maintained
 
+MACVLAN DRIVER
+P:     Patrick McHardy
+M:     kaber@trash.net
+L:     netdev@vger.kernel.org
+S:     Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:     Mirko Lindner
 M:     mlindner@syskonnect.de
@@ -2862,6 +2869,16 @@ M:       george@mvista.com
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 
+POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+P:     Anton Vorontsov
+M:     cbou@mail.ru
+P:     David Woodhouse
+M:     dwmw2@infradead.org
+L:     linux-kernel@vger.kernel.org
+L:     kernel-discuss@handhelds.org
+T:     git git.infradead.org/battery-2.6.git
+S:     Maintained
+
 POWERPC 4xx EMAC DRIVER
 P:     Eugene Surovegin
 M:     ebs@ebshome.net