[PATCH] x86: i8253/i8259A lock cleanup

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8172857..19a9a1c 100644 (file)
--- 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
@@ -576,10 +576,9 @@ S: Supported
 
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:     Michael H. Warfield
-M:     Michael H. Warfield <mhw@wittsend.com>
+M:     mhw@wittsend.com
 W:     http://www.wittsend.com/computone.html
-L:     linux-computone@lazuli.wittsend.com
-S:     Orphaned
+S:     Maintained
 
 COSA/SRP SYNC SERIAL DRIVER
 P:     Jan "Yenya" Kasprzak
@@ -1150,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
@@ -2602,7 +2601,7 @@ M:        davidm@snapgear.com
 P:     D. Jeff Dionne (created first uClinux port)
 M:     jeff@uclinux.org
 W:     http://www.uclinux.org/
-L:     uclinux-dev@uclinux.org
+L:     uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 
 UCLINUX FOR NEC V850
@@ -2626,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