summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-07-29 00:33:35 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-29 00:33:35 -0400
commit7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100 (patch)
tree4184f2a7d58ba1a1729225404e52d9a89463dd77 /MAINTAINERS
parenta47e9209485243afb4f002b8c3d76d1990b09d0a (diff)
parent8f0f850e240df5bea027caeb1723142c50e37e57 (diff)
downloadlinux-7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100.tar.bz2
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS21
1 files changed, 21 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 47f01f6da74c..dbb9d90ccad8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2594,6 +2594,18 @@ P: Nicolas Pitre
M: nico@cam.org
S: Maintained
+SOFTMAC LAYER (IEEE 802.11)
+P: Johannes Berg
+M: johannes@sipsolutions.net
+P: Joe Jezak
+M: josejx@gentoo.org
+P: Daniel Drake
+M: dsd@gentoo.org
+W: http://softmac.sipsolutions.net/
+L: softmac-dev@sipsolutions.net
+L: netdev@vger.kernel.org
+S: Maintained
+
SOFTWARE RAID (Multiple Disks) SUPPORT
P: Ingo Molnar
M: mingo@redhat.com
@@ -3302,6 +3314,15 @@ W: http://www.qsl.net/dl1bke/
L: linux-hams@vger.kernel.org
S: Maintained
+ZD1211RW WIRELESS DRIVER
+P: Daniel Drake
+M: dsd@gentoo.org
+P: Ulrich Kunitz
+M: kune@deine-taler.de
+W: http://zd1211.ath.cx/wiki/DriverRewrite
+L: zd1211-devs@lists.sourceforge.net (subscribers-only)
+S: Maintained
+
ZF MACHZ WATCHDOG
P: Fernando Fuganti
M: fuganti@netbank.com.br