From fbe4c8d77f5bdffa7f6f90e6dd3abdd2faeef203 Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <devnull@localhost>
Date: Tue, 24 May 2005 23:13:06 +0000
Subject: Merge v4l-saa7134-ntsc-vbi-fix.patch

---
 v4l/ChangeLog | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 442948a77..20eee2d0c 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-25 02:40  nshmyrev
+
+	* saa7134-vbi.c, saa7134-video.c, saa7134.h:
+	
+	saa7134 ntsc vbi fix. Patch from mschimek@nusurf.at which is merged to
+	kernel -mm tree.
+
 2005-05-25 02:25  kraxel 
 
 	* bttv-i2c.c: Don't try to access the i2c bus if the register wasn't successful.
@@ -1015,7 +1022,7 @@
 	  saa7134-reg.h, saa7134-ts.c, saa7134-tvaudio.c, saa7134-vbi.c,
 	  saa7134-video.c, saa7134.h, video-buf.c, video-buf.h:
 
-	- added a bunch of $Id: ChangeLog,v 1.5 2005/05/24 22:32:48 nsh Exp $ tags.
+	- added a bunch of $Id: ChangeLog,v 1.6 2005/05/24 23:13:06 nsh Exp $ tags.
 
 2004-09-15 17:35  kraxel
 
-- 
cgit v1.2.3