summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-07 02:40:03 +0000
committerSteve French <sfrench@us.ibm.com>2006-06-07 02:40:03 +0000
commitf3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch)
treeb4702cbdbf2c4517a5986bbaa971495b0f92a877 /MAINTAINERS
parent5bafd76593f060540acbea3b61e3087e009aa269 (diff)
parent1def630a6a49dda5bc89dfbd86656293640456f0 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS17
1 files changed, 17 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 74d71cafb17c..c3c5842402df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -568,6 +568,18 @@ L: linuxppc-dev@ozlabs.org
W: http://www.penguinppc.org/ppc64/
S: Supported
+BROADCOM BNX2 GIGABIT ETHERNET DRIVER
+P: Michael Chan
+M: mchan@broadcom.com
+L: netdev@vger.kernel.org
+S: Supported
+
+BROADCOM TG3 GIGABIT ETHERNET DRIVER
+P: Michael Chan
+M: mchan@broadcom.com
+L: netdev@vger.kernel.org
+S: Supported
+
BTTV VIDEO4LINUX DRIVER
P: Mauro Carvalho Chehab
M: mchehab@infradead.org
@@ -1877,6 +1889,11 @@ L: linux-kernel@vger.kernel.org
W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
S: Maintained
+MULTIMEDIA CARD SUBSYSTEM
+P: Russell King
+M: rmk+mmc@arm.linux.org.uk
+S: Maintained
+
MULTISOUND SOUND DRIVER
P: Andrew Veliath
M: andrewtv@usa.net