From c90d48e1feb3cf7ab01471b0c7f92e002b1fc8f3 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Fri, 30 Sep 2005 00:06:36 +0000
Subject: DVB/V4L bt8xx tree-merge is currently broken. If you need this
 feature, please use an older video4linux cvs:

cvs co -D 9/29/05 video4linux
---
 v4l/ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 81e13df69..270957e70 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-30 00:01  mkrufky
+
+	* bttv-cards.c, saa7134-input.c:
+	- strip trailing whitespace.
+
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- V4L: WARNING!  bt8xx tree-merge is currently broken.
+	  If you need this feature, please use an older video4linux cvs:
+	  cvs co -D 9/29/05 video4linux
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-09-29 20:40  mchehab
 
 	* doc/CARDLIST.bttv:
-- 
cgit v1.2.3