summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e4ec457f6..85cbf76be 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-19 00:20 mkrufky
+
+ * ../v4l/Makefile:
+ - Fix normal v4l build. Tree-merge temporarily disabled.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-18 23:50 nshmyrev
* ../linux/drivers/media/video/tda8290.c: (tda8290_init):