From 4b944966b29073549f919b4378bb34cf2c0363ac Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Sat, 30 Jul 2005 16:21:58 +0000
Subject: Fix cvs compile for 2.6.13

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

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 45b1ccfd8..348832b5f 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,5 +1,10 @@
-2005-07-29 12:45  mchehab
+2005-07-30 16:17  mkrufky
+	* cx88-dvb.c, scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- Fix cvs compile for 2.6.13
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
 
+2005-07-29 12:45  mchehab
 	* bttv-cards.c:
 	- Acorp Y878F PCI identifier corrected. Board has radio.
 
-- 
cgit v1.2.3