2.6.26-rc2-git5

diff --git a/MAINTAINERS b/MAINTAINERS
index f5583dc..bc1c008 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -367,12 +367,12 @@ S:   Maintained for 2.4; PCI support for 2.6.
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:   Thomas Dahlmann
 M:   thomas.dahlmann@amd.com
-L:   info-linux@geode.amd.com   (subscribers-only)
+L:   linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:   Supported
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
 P:   Jordan Crouse
-L:   info-linux@geode.amd.com   (subscribers-only)
+L:   linux-geode@lists.infradead.org (moderated for non-subscribers)
 W:   http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:   Supported
 
@@ -1230,6 +1230,15 @@ P:   Jaya Kumar
 M:   jayakumar.alsa@gmail.com
 S:   Maintained
 
+CX18 VIDEO4LINUX DRIVER
+P:   Hans Verkuil, Andy Walls
+M:   hverkuil@xs4all.nl, awalls@radix.net
+L:   ivtv-devel@ivtvdriver.org
+L:   ivtv-users@ivtvdriver.org
+L:   video4linux-list@redhat.com
+W:   http://linuxtv.org
+S:   Maintained
+
 CYBERPRO FB DRIVER
 P:   Russell King
 M:   rmk@arm.linux.org.uk