X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=MAINTAINERS;h=5b454627f211b56aff1d7428eacae08173df9db7;hb=b733588559fc13547a59ccf81651c775b8f2719c;hp=f985dfa5941c7dfd8500ab1c0971ff3e15970124;hpb=0e81bef05e3b90f8319e79bf36e61341f7b6e189;p=powerpc.git

diff --git a/MAINTAINERS b/MAINTAINERS
index f985dfa594..5b454627f2 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