X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=MAINTAINERS;h=abf7f7a17ae0eac9f5cd36acfdac298a3dbf8e3e;hb=782c3fd470abddf2525e34cf3131215a8f95e834;hp=c1bc9a86a99d61a7944886ef6179e6c9813032e8;hpb=2dd3c1df95fb29e9227f16ccd7d786d129e2b34d;p=linux-2.6

diff --git a/MAINTAINERS b/MAINTAINERS
index c1bc9a86a9..abf7f7a17a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1168,11 +1168,6 @@ L:	linux1394-devel@lists.sourceforge.net
 W:	http://www.linux1394.org/
 S:	Orphan
 
-IEEE 1394 SBP2
-L:	linux1394-devel@lists.sourceforge.net
-W:	http://www.linux1394.org/
-S:	Orphan
-
 IEEE 1394 SUBSYSTEM
 P:	Ben Collins
 M:	bcollins@debian.org
@@ -1207,6 +1202,15 @@ L:	linux1394-devel@lists.sourceforge.net
 W:	http://www.linux1394.org/
 S:	Maintained
 
+IEEE 1394 SBP2
+P:	Ben Collins
+M:	bcollins@debian.org
+P:	Stefan Richter
+M:	stefanr@s5r6.in-berlin.de
+L:	linux1394-devel@lists.sourceforge.net
+W:	http://www.linux1394.org/
+S:	Maintained
+
 IMS TWINTURBO FRAMEBUFFER DRIVER
 P:	Paul Mundt
 M:	lethal@chaoticdreams.org
@@ -1743,8 +1747,11 @@ S:	Maintained
 IPVS
 P:	Wensong Zhang
 M:	wensong@linux-vs.org
+P:	Simon Horman
+M:	horms@verge.net.au
 P:	Julian Anastasov
 M:	ja@ssi.bg
+L:	netdev@vger.kernel.org
 S:	Maintained
 
 NFS CLIENT