diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-06 11:02:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-06 11:02:22 -0400 |
| commit | a2413598b8c5f14d75f914ce95d72bacdeabd05e (patch) | |
| tree | 35e1340b05b295dbefefaa45424e00a55c28402e /MAINTAINERS | |
| parent | f2ad2d9b65963322186a8af2bd2965c734a7badb (diff) | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6c399b872e3a..562775007785 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -449,9 +449,9 @@ L: linux-hams@vger.kernel.org | |||
| 449 | W: http://www.baycom.org/~tom/ham/ham.html | 449 | W: http://www.baycom.org/~tom/ham/ham.html |
| 450 | S: Maintained | 450 | S: Maintained |
| 451 | 451 | ||
| 452 | BCM43XX WIRELESS DRIVER | 452 | BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION) |
| 453 | P: Michael Buesch | 453 | P: Larry Finger |
| 454 | M: mb@bu3sch.de | 454 | M: Larry.Finger@lwfinger.net |
| 455 | P: Stefano Brivio | 455 | P: Stefano Brivio |
| 456 | M: st3@riseup.net | 456 | M: st3@riseup.net |
| 457 | W: http://bcm43xx.berlios.de/ | 457 | W: http://bcm43xx.berlios.de/ |