diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 21:24:46 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 21:24:46 +0200 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /MAINTAINERS | |
| parent | Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
| parent | Linux 2.6.17-rc6 (diff) | |
| download | linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.xz linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8e88ff9c49ff..1421f74b6009 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 @@ -1883,6 +1895,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 |