summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog8
1 files changed, 7 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a44459729..4473216eb 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-12 16:55 mkrufky
+
+ * linux/drivers/media/dvb/dvb-usb/cxusb.c:
+ - Updated MODULE_AUTHOR
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-12 16:13 mkrufky
* linux/drivers/media/video/cx88/Makefile:
@@ -108,7 +115,6 @@
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
->>>>>>> 1.865
2006-01-12 00:11 mchehab
* linux/drivers/media/video/cx25840/cx25840-core.c: (set_input),