i386: move xen

[linux-3.10.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 10a6f57776b29eb82c49485a5f39ecd173a52396..9a91d9e3f1f25c2e0aaded950fae19e4d6fa7e08 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -44,9 +44,10 @@ trivial patch so apply some common sense.
        or does something very odd once a month document it.
 
        PLEASE remember that submissions must be made under the terms
-       of the OSDL certificate of contribution
-       (http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html)
-       and should include a Signed-off-by: line.
+       of the OSDL certificate of contribution and should include a
+       Signed-off-by: line.  The current version of this "Developer's
+       Certificate of Origin" (DCO) is listed in the file
+       Documentation/SubmittingPatches.
 
 6.     Make sure you have the right to send any changes you make. If you
        do changes at work you may find your employer owns the patch
@@ -2057,12 +2058,18 @@ L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2200.sourceforge.net
 S:     Supported
 
-IOC3 DRIVER
+IOC3 ETHERNET DRIVER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
 L:     linux-mips@linux-mips.org
 S:     Maintained
 
+IOC3 SERIAL DRIVER
+P:     Pat Gefre
+M:     pfg@sgi.com
+L:     linux-kernel@linux-mips.org
+S:     Maintained
+
 IP MASQUERADING:
 P:     Juanjo Ciarlante
 M:     jjciarla@raiz.uncu.edu.ar
@@ -2594,6 +2601,19 @@ M:       shemminger@linux-foundation.org
 L:     netem@lists.linux-foundation.org
 S:     Maintained
 
+NETERION (S2IO) Xframe 10GbE DRIVER
+P:     Ramkrishna Vepa
+M:     ram.vepa@neterion.com
+P:     Rastapur Santosh
+M:     santosh.rastapur@neterion.com
+P:     Sivakumar Subramani
+M:     sivakumar.subramani@neterion.com
+P:     Sreenivasa Honnur
+M:     sreenivasa.honnur@neterion.com
+L:     netdev@vger.kernel.org
+W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+S:     Supported
+
 NETFILTER/IPTABLES/IPCHAINS
 P:     Rusty Russell
 P:     Marc Boucher
@@ -2602,8 +2622,8 @@ P:        Harald Welte
 P:     Jozsef Kadlecsik
 P:     Patrick McHardy
 M:     kaber@trash.net
-L:     netfilter-devel@lists.netfilter.org
-L:     netfilter@lists.netfilter.org (subscribers-only)
+L:     netfilter-devel@vger.kernel.org
+L:     netfilter@vger.kernel.org
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
@@ -2656,11 +2676,17 @@ M:      jmorris@namei.org
 P:     Hideaki YOSHIFUJI
 M:     yoshfuji@linux-ipv6.org
 P:     Patrick McHardy
-M:     kaber@coreworks.de
+M:     kaber@trash.net
 L:     netdev@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:     Maintained
 
+NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
+P:     Paul Moore
+M:     paul.moore@hp.com
+L:     netdev@vger.kernel.org
+S:     Maintained
+
 NETWORKING [WIRELESS]
 P:     John W. Linville
 M:     linville@tuxdriver.com
@@ -2728,19 +2754,6 @@ M:       adaplas@gmail.com
 L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:     Maintained
 
-NETERION (S2IO) Xframe 10GbE DRIVER
-P:     Ramkrishna Vepa
-M:     ram.vepa@neterion.com
-P:     Rastapur Santosh
-M:     santosh.rastapur@neterion.com
-P:     Sivakumar Subramani
-M:     sivakumar.subramani@neterion.com
-P:     Sreenivasa Honnur
-M:     sreenivasa.honnur@neterion.com
-L:     netdev@vger.kernel.org
-W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
-S:     Supported
-
 OPENCORES I2C BUS DRIVER
 P:     Peter Korsgaard
 M:     jacmet@sunsite.dk