Merge commit 'jwb/next' into next

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a654c5b9c2714fae1c068ea01e29a1671ddc6483..e784b358b33519a584729d99a7723de4e9497393 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4924,11 +4924,11 @@ L:      zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:     Maintained
 
 ZR36067 VIDEO FOR LINUX DRIVER
-P:     Ronald Bultje
-M:     rbultje@ronald.bitfreak.net
 L:     mjpeg-users@lists.sourceforge.net
+L:     linux-media@vger.kernel.org
 W:     http://mjpeg.sourceforge.net/driver-zoran/
-S:     Maintained
+T:     Mercurial http://linuxtv.org/hg/v4l-dvb
+S:     Odd Fixes
 
 ZS DECSTATION Z85C30 SERIAL DRIVER
 P:     Maciej W. Rozycki