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) |
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 4add2f289591..f317cb42952f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -512,11 +512,11 @@ W: http://linuxppc64.org | |||
512 | S: Supported | 512 | S: Supported |
513 | 513 | ||
514 | BTTV VIDEO4LINUX DRIVER | 514 | BTTV VIDEO4LINUX DRIVER |
515 | P: Gerd Knorr | 515 | P: Mauro Carvalho Chehab |
516 | M: kraxel@bytesex.org | 516 | M: mchehab@brturbo.com.br |
517 | L: video4linux-list@redhat.com | 517 | L: video4linux-list@redhat.com |
518 | W: http://bytesex.org/bttv/ | 518 | W: http://linuxtv.org |
519 | S: Orphan | 519 | S: Maintained |
520 | 520 | ||
521 | BUSLOGIC SCSI DRIVER | 521 | BUSLOGIC SCSI DRIVER |
522 | P: Leonard N. Zubkoff | 522 | P: Leonard N. Zubkoff |
@@ -2632,10 +2632,11 @@ W: http://rio500.sourceforge.net | |||
2632 | S: Maintained | 2632 | S: Maintained |
2633 | 2633 | ||
2634 | VIDEO FOR LINUX | 2634 | VIDEO FOR LINUX |
2635 | P: Gerd Knorr | 2635 | P: Mauro Carvalho Chehab |
2636 | M: kraxel@bytesex.org | 2636 | M: mchehab@brturbo.com.br |
2637 | L: video4linux-list@redhat.com | 2637 | L: video4linux-list@redhat.com |
2638 | S: Orphan | 2638 | W: http://linuxtv.org |
2639 | S: Maintained | ||
2639 | 2640 | ||
2640 | W1 DALLAS'S 1-WIRE BUS | 2641 | W1 DALLAS'S 1-WIRE BUS |
2641 | P: Evgeniy Polyakov | 2642 | P: Evgeniy Polyakov |