diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c0cc52a9afe5..f50e927a1189 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2558,12 +2558,10 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp | |||
2558 | S: Maintained | 2558 | S: Maintained |
2559 | 2559 | ||
2560 | MAC80211 | 2560 | MAC80211 |
2561 | P: Michael Wu | ||
2562 | M: flamingice@sourmilk.net | ||
2563 | P: Johannes Berg | 2561 | P: Johannes Berg |
2564 | M: johannes@sipsolutions.net | 2562 | M: johannes@sipsolutions.net |
2565 | P: Jiri Benc | 2563 | P: Michael Wu |
2566 | M: jbenc@suse.cz | 2564 | M: flamingice@sourmilk.net |
2567 | L: linux-wireless@vger.kernel.org | 2565 | L: linux-wireless@vger.kernel.org |
2568 | W: http://linuxwireless.org/ | 2566 | W: http://linuxwireless.org/ |
2569 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git | 2567 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git |