diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
| commit | e9dd2561793c05d70c9df1bc16a2dde6f23388df (patch) | |
| tree | 20099972569cc0748133a6351600fff9cbb15f4a /MAINTAINERS | |
| parent | d011e151bc5d1a581bf35b492a4fde44d30382b9 (diff) | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| download | kernel-crypto-e9dd2561793c05d70c9df1bc16a2dde6f23388df.tar.gz kernel-crypto-e9dd2561793c05d70c9df1bc16a2dde6f23388df.tar.xz kernel-crypto-e9dd2561793c05d70c9df1bc16a2dde6f23388df.zip | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4add2f28959..f317cb42952 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -512,11 +512,11 @@ W: http://linuxppc64.org S: Supported BTTV VIDEO4LINUX DRIVER -P: Gerd Knorr -M: kraxel@bytesex.org +P: Mauro Carvalho Chehab +M: mchehab@brturbo.com.br L: video4linux-list@redhat.com -W: http://bytesex.org/bttv/ -S: Orphan +W: http://linuxtv.org +S: Maintained BUSLOGIC SCSI DRIVER P: Leonard N. Zubkoff @@ -2632,10 +2632,11 @@ W: http://rio500.sourceforge.net S: Maintained VIDEO FOR LINUX -P: Gerd Knorr -M: kraxel@bytesex.org +P: Mauro Carvalho Chehab +M: mchehab@brturbo.com.br L: video4linux-list@redhat.com -S: Orphan +W: http://linuxtv.org +S: Maintained W1 DALLAS'S 1-WIRE BUS P: Evgeniy Polyakov |