aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-30 00:49:38 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-30 00:49:38 -0400
commite9dd2561793c05d70c9df1bc16a2dde6f23388df (patch)
tree20099972569cc0748133a6351600fff9cbb15f4a /MAINTAINERS
parentd011e151bc5d1a581bf35b492a4fde44d30382b9 (diff)
parent0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff)
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS15
1 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4add2f289591..f317cb42952f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -512,11 +512,11 @@ W: http://linuxppc64.org
512S: Supported 512S: Supported
513 513
514BTTV VIDEO4LINUX DRIVER 514BTTV VIDEO4LINUX DRIVER
515P: Gerd Knorr 515P: Mauro Carvalho Chehab
516M: kraxel@bytesex.org 516M: mchehab@brturbo.com.br
517L: video4linux-list@redhat.com 517L: video4linux-list@redhat.com
518W: http://bytesex.org/bttv/ 518W: http://linuxtv.org
519S: Orphan 519S: Maintained
520 520
521BUSLOGIC SCSI DRIVER 521BUSLOGIC SCSI DRIVER
522P: Leonard N. Zubkoff 522P: Leonard N. Zubkoff
@@ -2632,10 +2632,11 @@ W: http://rio500.sourceforge.net
2632S: Maintained 2632S: Maintained
2633 2633
2634VIDEO FOR LINUX 2634VIDEO FOR LINUX
2635P: Gerd Knorr 2635P: Mauro Carvalho Chehab
2636M: kraxel@bytesex.org 2636M: mchehab@brturbo.com.br
2637L: video4linux-list@redhat.com 2637L: video4linux-list@redhat.com
2638S: Orphan 2638W: http://linuxtv.org
2639S: Maintained
2639 2640
2640W1 DALLAS'S 1-WIRE BUS 2641W1 DALLAS'S 1-WIRE BUS
2641P: Evgeniy Polyakov 2642P: Evgeniy Polyakov