diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 12:18:00 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 12:18:00 +0200 |
commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /MAINTAINERS | |
parent | Merge branch 'upstream-fixes' (diff) | |
parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-45de6fd958d7f407bdb5fdc6914b3262519d891c.tar.xz linux-45de6fd958d7f407bdb5fdc6914b3262519d891c.zip |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4d442eae377a..3d5501059d56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -421,6 +421,14 @@ L: linux-hams@vger.kernel.org W: http://www.baycom.org/~tom/ham/ham.html S: Maintained +BCM43XX WIRELESS DRIVER +P: Michael Buesch +M: mb@bu3sch.de +P: Stefano Brivio +M: st3@riseup.net +W: http://bcm43xx.berlios.de/ +S: Maintained + BEFS FILE SYSTEM P: Sergey S. Kostyliov M: rathamahata@php4.ru @@ -2071,8 +2079,12 @@ P: Matthew Wilcox M: matthew@wil.cx P: Grant Grundler M: grundler@parisc-linux.org +P: Kyle McMartin +M: kyle@parisc-linux.org L: parisc-linux@parisc-linux.org W: http://www.parisc-linux.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git +T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6 S: Maintained PCI ERROR RECOVERY |