X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=59db481c77de81e808c489ec9a95be3f411dce35;hb=b3af547e197fa3ca648d148dd8d36befe989e5a0;hp=2340cfb1e25d3d361e7fab799f23249fc124a245;hpb=612166c76d6bd1ccd2624a15586a92444d2c4c0e;p=~andy%2Flinux

diff --git a/MAINTAINERS b/MAINTAINERS
index 2340cfb1e25..59db481c77d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2141,6 +2141,15 @@ L:	isdn4linux@listserv.isdn4linux.de
 W:	http://www.melware.de
 S:	Maintained
 
+IVTV VIDEO4LINUX DRIVER
+P:	Hans Verkuil
+M:	hverkuil@xs4all.nl
+L:	ivtv-devel@ivtvdriver.org
+L:	ivtv-users@ivtvdriver.org
+L:	video4linux-list@redhat.com
+W:	http://www.ivtvdriver.org
+S:	Maintained
+
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 P:	David Woodhouse
 M:	dwmw2@infradead.org
@@ -3260,8 +3269,10 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:	Supported
 
 S390 ZFCP DRIVER
-P:	Swen Schillig
-M:	swen@vnet.ibm.com
+P:	Christof Schmitt
+M:	christof.schmitt@de.ibm.com
+P:	Martin Peschke
+M:	mp3@de.ibm.com
 M:	linux390@de.ibm.com
 L:	linux-s390@vger.kernel.org
 W:	http://www.ibm.com/developerworks/linux/linux390/