[PATCH] powerpc: Move scanlog.c to platforms/pseries

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 4cba302c2754b998cd8150c162f7cec8630979ed..5541f9970b879de1c93902c54fb22efafe62a11b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1330,6 +1330,24 @@ M:       john.ronciak@intel.com
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
 
+INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
+P:     Yi Zhu
+M:     yi.zhu@intel.com
+P:     James Ketrenos
+M:     jketreno@linux.intel.com
+L:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:     http://ipw2100.sourceforge.net
+S:     Supported
+
+INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
+P:     Yi Zhu
+M:     yi.zhu@intel.com
+P:     James Ketrenos
+M:     jketreno@linux.intel.com
+L:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:     http://ipw2200.sourceforge.net
+S:     Supported
+
 IOC3 DRIVER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
@@ -2071,6 +2089,12 @@ P:       Matt Mackall
 M:     mpm@selenic.com
 S:     Maintained
 
+RAPIDIO SUBSYSTEM
+P:     Matt Porter
+M:     mporter@kernel.crashing.org
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 REAL TIME CLOCK DRIVER
 P:     Paul Gortmaker
 M:     p_gortmaker@yahoo.com
@@ -2475,10 +2499,10 @@ L:      linux-kernel@vger.kernel.org
 S:     Maintained
 
 TRIVIAL PATCHES
-P:      Rusty Russell
-M:      trivial@rustcorp.com.au
+P:      Adrian Bunk
+M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
+W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
 S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER