Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 11800c33ea84760575944dbca4e5fd3458ff3086..9dee3ce27fc7672766ce27430e5b0fc76293b473 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2558,12 +2558,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
-M:     jbenc@suse.cz
+P:     Michael Wu
+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