From 490591975ea47ec8b2bcfecf099d5af2588c8b2b Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Sat, 1 Oct 2005 16:55:07 +0000
Subject: dvb-bt8xx and DST build re-renabled in tree-merge.

---
 v4l/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 2438ce305..20a9b7a93 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-01 16:53  mkrufky
+
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- dvb-bt8xx and DST build re-renabled in tree-merge.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-09-30 15:21  mchehab
 
 	* saa7134-cards.c: (saa7134_board_init1):
-- 
cgit v1.2.3