aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 11:40:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 11:40:34 -0400
commitd02aacff4467806ee56f147ac8eff6911d95811a (patch)
tree3bc6197f735f18dd4c3cd7c77f2a45bb9b8fac16 /MAINTAINERS
parente270b51df657011983241ec61a1fc7de186e16cd (diff)
parent9edb74cc6ccb3a893c3d40727b7003c3c16f85a0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits) tun: Multicast handling in tun_chr_ioctl() needs proper locking. [NET]: Fix heavy stack usage in seq_file output routines. [AF_UNIX] Initialise UNIX sockets before general device initcalls [RTNETLINK]: Fix bogus ASSERT_RTNL warning iwlwifi: Fix built-in compilation of iwlcore (part 2) tun: Fix minor race in TUNSETLINK ioctl handling. ppp_generic: use stats from net_device structure iwlwifi: Don't unlock priv->mutex if it isn't locked wireless: rndis_wlan: modparam_workaround_interval is never below 0. prism54: prism54_get_encode() test below 0 on unsigned index mac80211: update mesh EID values b43: Workaround DMA quirks mac80211: fix use before check of Qdisc length net/mac80211/rx.c: fix off-by-one mac80211: Fix race between ieee80211_rx_bss_put and lookup routines. ath5k: Fix radio identification on AR5424/2424 ssb: Fix all-ones boardflags b43: Add more btcoexist workarounds b43: Fix HostFlags data types b43: Workaround invalid bluetooth settings ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
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
2558S: Maintained 2558S: Maintained
2559 2559
2560MAC80211 2560MAC80211
2561P: Michael Wu
2562M: flamingice@sourmilk.net
2563P: Johannes Berg 2561P: Johannes Berg
2564M: johannes@sipsolutions.net 2562M: johannes@sipsolutions.net
2565P: Jiri Benc 2563P: Michael Wu
2566M: jbenc@suse.cz 2564M: flamingice@sourmilk.net
2567L: linux-wireless@vger.kernel.org 2565L: linux-wireless@vger.kernel.org
2568W: http://linuxwireless.org/ 2566W: http://linuxwireless.org/
2569T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git 2567T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git