diff --git a/[refs] b/[refs]
index 681cfadebb6d..7fcf83bbdb92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cea0c681bef872d0618d87be078cb006665a6fdf
+refs/heads/master: a99e30d70bcb83bdd097945df282199ead9c9a4b
diff --git a/trunk/drivers/media/video/vino.c b/trunk/drivers/media/video/vino.c
index b62e030ba83a..675067f92d96 100644
--- a/trunk/drivers/media/video/vino.c
+++ b/trunk/drivers/media/video/vino.c
@@ -8,6 +8,12 @@
  *
  * Based on the previous version of the driver for 2.4 kernels by:
  * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *
+ * v4l2_device/v4l2_subdev conversion by:
+ * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl>
+ *
+ * Note: this conversion is untested! Please contact the linux-media
+ * mailinglist if you can test this, together with the test results.
  */
 
 /*