aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 03:48:33 -0400
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 03:48:33 -0400
commit5d8c397f304e1363f8ff9749b08172eb59e6534a (patch)
tree57ff502553918aa7309b7375e983f27f719e7b28 /MAINTAINERS
parent44757223cd77f6e332dfa0b043c67df7b665bc19 (diff)
parentceeec3dc375e3b0618f16b34efc56fe093918f8b (diff)
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e8214fe53a5e..671e32905d28 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -991,6 +991,13 @@ M: mike.miller@hp.com
991L: iss_storagedev@hp.com 991L: iss_storagedev@hp.com
992S: Supported 992S: Supported
993 993
994HOST AP DRIVER
995P: Jouni Malinen
996M: jkmaline@cc.hut.fi
997L: hostap@shmoo.com
998W: http://hostap.epitest.fi/
999S: Maintained
1000
994HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series 1001HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
995P: Jaroslav Kysela 1002P: Jaroslav Kysela
996M: perex@suse.cz 1003M: perex@suse.cz