From c3aa185f55fdc149f5491cd71c1e76b49f56ecd4 Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <devnull@localhost>
Date: Sun, 22 May 2005 19:23:39 +0000
Subject: Large changes. Mostly merged patches from mm kernel branch and
 2.6.12-rc4. Update entries for Lifiview Platinum FM and Avermedia cards

---
 v4l/ChangeLog | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index fab3fb72e..8c274c932 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,36 @@
+2005-05-23 23:50  nshmyrev
+
+	* saa7134-cards.c, saa7134.h, saa7134-input.c:
+	
+	Update entries for Lifeview Platinum FM, Avermedia 307 Studio,
+	Avermedia 307 and Avermedia GO 007 FM
+
+2005-05-22 23:40  nshmyrev
+
+	* ir-common.c:
+	
+	Update hauppage ir codes
+
+2005-05-22 23:20  nshmyrev
+
+	* tda9887.c, tuner-core.c:
+	
+	Fix module_param_string argument order
+
+2005-05-22 23:20  nshmyrev
+
+	* bttv-i2c.c, compat.h, cx88-dvb.c, saa6752hs.c:
+	* saa7134-core.c, saa7134-empress.c:
+	
+	Merge changes from 2.6.12 kernel.
+
+2005-05-22 23:06  nshmyrev
+
+	* scripts/cardlist, doc/CARDLIST.bttv, doc/CARDLIST.cx88:
+	* doc/CARDLIST.tuner, doc/CARDLIST.saa7134:
+	
+	Update cardlist script and list of cards
+
 2005-04-26 11:01  kraxel
 
 	* README.patches:
@@ -965,7 +998,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.1 2005/05/22 18:32:31 nsh Exp $ tags.
+	- added a bunch of $Id: ChangeLog,v 1.2 2005/05/22 19:23:39 nsh Exp $ tags.
 
 2004-09-15 17:35  kraxel
 
-- 
cgit v1.2.3