Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b7a154..9c592aa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -540,7 +540,8 @@ S:  Supported
 
 BTTV VIDEO4LINUX DRIVER
 P:     Mauro Carvalho Chehab
-M:     mchehab@brturbo.com.br
+M:     mchehab@infradead.org
+M:     v4l-dvb-maintainer@linuxtv.org
 L:     video4linux-list@redhat.com
 W:     http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
@@ -837,11 +838,12 @@ S:        Maintained
 
 DVB SUBSYSTEM AND DRIVERS
 P:     LinuxTV.org Project
-M:     linux-dvb-maintainer@linuxtv.org
+M:     mchehab@infradead.org
+M:     v4l-dvb-maintainer@linuxtv.org
 L:     linux-dvb@linuxtv.org (subscription required)
 W:     http://linuxtv.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
-S:     Supported
+S:     Maintained
 
 EATA-DMA SCSI DRIVER
 P:     Michael Neuffer
@@ -2230,7 +2232,23 @@ P:       Martin Schwidefsky
 M:     schwidefsky@de.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-390@vm.marist.edu
-W:     http://oss.software.ibm.com/developerworks/opensource/linux390
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+
+S390 NETWORK DRIVERS
+P:     Frank Pavlic
+M:     fpavlic@de.ibm.com
+M:     linux390@de.ibm.com
+L:     linux-390@vm.marist.edu
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+
+S390 ZFCP DRIVER
+P:     Andreas Herrmann
+M:     aherrman@de.ibm.com
+M:     linux390@de.ibm.com
+L:     linux-390@vm.marist.edu
+W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
 SAA7146 VIDEO4LINUX-2 DRIVER
@@ -2962,7 +2980,8 @@ S:      Maintained
 
 VIDEO FOR LINUX
 P:     Mauro Carvalho Chehab
-M:     mchehab@brturbo.com.br
+M:     mchehab@infradead.org
+M:     v4l-dvb-maintainer@linuxtv.org
 L:     video4linux-list@redhat.com
 W:     http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git