]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - MAINTAINERS
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[linux-2.6.git] / MAINTAINERS
index 3028d4b98af2414068453a420a3d94adc7e05ce7..2313de23b0dad531fa6821a0c8a44d01f145ce24 100644 (file)
@@ -707,7 +707,7 @@ DCCP PROTOCOL
 P:     Arnaldo Carvalho de Melo
 M:     acme@mandriva.com
 L:     dccp@vger.kernel.org
-W:     http://www.wlug.org.nz/DCCP
+W:     http://linux-net.osdl.org/index.php/DCCP
 S:     Maintained
 
 DECnet NETWORK LAYER
@@ -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