1 files changed, 9 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a0b0d595d17c..19a9a1c53037 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
@@ -1149,7 +1149,7 @@ S:	Maintained
 
 INFINIBAND SUBSYSTEM
 P:      Roland Dreier
-M:      roland@topspin.com
+M:      rolandd@cisco.com
 P:      Sean Hefty
 M:      mshefty@ichips.intel.com
 P:      Hal Rosenstock
@@ -2625,10 +2625,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