1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 45b86ab45d51..36aadf6003b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2547,12 +2547,10 @@ W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 MAC80211
-P:      Michael Wu
-M:      flamingice@sourmilk.net
 P:      Johannes Berg
 M:      johannes@sipsolutions.net
-P:      Jiri Benc
+P:      Michael Wu
-M:      jbenc@suse.cz
+M:      flamingice@sourmilk.net
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

diff --git a/MAINTAINERS b/MAINTAINERS index 45b86ab45d51..36aadf6003b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -2547,12 +2547,10 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp
2547	S: Maintained	2547	S: Maintained
2548		2548
2549	MAC80211	2549	MAC80211
2550	P: Michael Wu
2551	M: flamingice@sourmilk.net
2552	P: Johannes Berg	2550	P: Johannes Berg
2553	M: johannes@sipsolutions.net	2551	M: johannes@sipsolutions.net
2554	P: Jiri Benc	2552	P: Michael Wu
2555	M: jbenc@suse.cz	2553	M: flamingice@sourmilk.net
2556	L: linux-wireless@vger.kernel.org	2554	L: linux-wireless@vger.kernel.org
2557	W: http://linuxwireless.org/	2555	W: http://linuxwireless.org/
2558	T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git	2556	T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git