Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 105ad85f5d60b1613352704043f2b5829905e962..3f8a90ac47d7942d81f20ab9b3aa0f14056d8e88 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -867,6 +867,15 @@ L: ebtables-devel@lists.sourceforge.net
 W:     http://ebtables.sourceforge.net/
 S:     Maintained
 
+EDAC-CORE
+P:      Doug Thompson
+M:      norsk5@xmission.com, dthompson@linuxnetworx.com
+P:      Dave Peterson
+M:      dsp@llnl.gov, dave_peterson@pobox.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
 EEPRO100 NETWORK DRIVER
 P:     Andrey V. Savochkin
 M:     saw@saw.sw.com.sg
@@ -1846,6 +1855,13 @@ L:       netdev@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:     Maintained
 
+NETWORKING [WIRELESS]
+P:     John W. Linville
+M:     linville@tuxdriver.com
+L:     netdev@vger.kernel.org
+T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+S:     Maintained
+
 IPVS
 P:     Wensong Zhang
 M:     wensong@linux-vs.org