1 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4db63de9652a..19a9a1c53037 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -512,11 +512,11 @@ W:	http://linuxppc64.org
 S:      Supported
 BTTV VIDEO4LINUX DRIVER
-P:      Gerd Knorr
+P:      Mauro Carvalho Chehab
-M:      kraxel@bytesex.org
+M:      mchehab@brturbo.com.br
 L:      video4linux-list@redhat.com
-W:      http://bytesex.org/bttv/
+W:      http://linuxtv.org
-S:      Orphan
+S:      Maintained
 BUSLOGIC SCSI DRIVER
 P:      Leonard N. Zubkoff
@@ -2625,10 +2625,11 @@ W:	http://rio500.sourceforge.net
 S:      Maintained
 VIDEO FOR LINUX
-P:      Gerd Knorr
+P:      Mauro Carvalho Chehab
-M:      kraxel@bytesex.org
+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

diff --git a/MAINTAINERS b/MAINTAINERS index 4db63de9652a..19a9a1c53037 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
@@ -2625,10 +2625,11 @@ W: http://rio500.sourceforge.net
2625	S: Maintained	2625	S: Maintained
2626		2626
2627	VIDEO FOR LINUX	2627	VIDEO FOR LINUX
2628	P: Gerd Knorr	2628	P: Mauro Carvalho Chehab
2629	M: kraxel@bytesex.org	2629	M: mchehab@brturbo.com.br
2630	L: video4linux-list@redhat.com	2630	L: video4linux-list@redhat.com
2631	S: Orphan	2631	W: http://linuxtv.org
		2632	S: Maintained
2632		2633
2633	W1 DALLAS'S 1-WIRE BUS	2634	W1 DALLAS'S 1-WIRE BUS
2634	P: Evgeniy Polyakov	2635	P: Evgeniy Polyakov