diff --git a/[refs] b/[refs]
index 6f50699a7e21..3c36112a6bae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fb0fd05b2f03065ca4743e8c7446ec86329c4c8
+refs/heads/master: 6d8425b1e38f69e349818299f245d35fb5c3a7d5
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index b18242f8d96b..bc1c0088dc49 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -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