From b1d168376a16805da958799cdfd2db181434a7d6 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Thu, 12 Jan 2006 16:57:00 +0000
Subject: Updated MODULE_AUTHOR

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 v4l/ChangeLog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'v4l/ChangeLog')

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),
-- 
cgit v1.2.3