diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-28 13:47:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-28 14:16:05 +1100 |
| commit | 241a2a43d0435db7d70b1245fef7494427bd63cc (patch) | |
| tree | ff6540b73c62bf23057dbd89a4ff4f3dd6e38f69 /MAINTAINERS | |
| parent | 393e074733dd835dc9ad04db9766b695d2af6619 (diff) | |
| parent | 2d38f9a4f8d2ebdc799f03eecf82345825495711 (diff) | |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d19f174333a..430ec2f9dd4a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -834,15 +834,6 @@ L: linux-wireless@vger.kernel.org W: http://linuxwireless.org/en/users/Drivers/b43 S: Maintained -BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION) -P: Larry Finger -M: Larry.Finger@lwfinger.net -P: Stefano Brivio -M: stefano.brivio@polimi.it -L: linux-wireless@vger.kernel.org -W: http://bcm43xx.berlios.de/ -S: Obsolete - BEFS FILE SYSTEM P: Sergey S. Kostyliov M: rathamahata@php4.ru @@ -3612,12 +3603,6 @@ P: Ben Nizette M: bn@niasdigital.com S: Maintained -SOFTMAC LAYER (IEEE 802.11) -P: Daniel Drake -M: dsd@gentoo.org -L: linux-wireless@vger.kernel.org -S: Obsolete - SOFTWARE RAID (Multiple Disks) SUPPORT P: Ingo Molnar M: mingo@redhat.com |