summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-10-25 22:49:43 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-25 22:49:43 -0700
commit4bc3e17cce5662092703b02ee7b030047b1c99b3 (patch)
tree4f5edd94866a8a944518e1888034084de1bfd05e /MAINTAINERS
parentfee9dee730a40f671c1972a324ed54f0d68523e1 (diff)
parentddd68587d0470498eb161de37b8f9fb5c48786a3 (diff)
Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f985dfa5941..5b454627f21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2449,13 +2449,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp
S: Maintained
MAC80211
-P: Jiri Benc
-M: jbenc@suse.cz
P: Michael Wu
M: flamingice@sourmilk.net
+P: Johannes Berg
+M: johannes@sipsolutions.net
+P: Jiri Benc
+M: jbenc@suse.cz
L: linux-wireless@vger.kernel.org
W: http://linuxwireless.org/
-T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
+T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
S: Maintained
MACVLAN DRIVER