aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-26 06:18:00 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-26 06:18:00 -0400
commit45de6fd958d7f407bdb5fdc6914b3262519d891c (patch)
treec1b9f9023e93d0f28f773ca4be41d107f79cd600 /MAINTAINERS
parent1f5d5dbf0372dd933d8325054889ba09d996e50b (diff)
parent3b908870b8332dfd40be0e919e187aa4991536fb (diff)
downloadautogen-45de6fd958d7f407bdb5fdc6914b3262519d891c.tar.gz
autogen-45de6fd958d7f407bdb5fdc6914b3262519d891c.tar.xz
autogen-45de6fd958d7f407bdb5fdc6914b3262519d891c.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 12 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4d442eae377..3d5501059d5 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