From d71c2b766251c46d3bfb05037c3b1aaea7947a7a Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Tue, 10 Jan 2006 04:29:23 +0000
Subject: Add bttv card MagicTV (rebranded MachTV) From: Julian Calaby
 <julian.calaby@gmail.com>

	- Add bttv card MagicTV (rebranded MachTV)

Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 v4l/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ba835abc3..84168d419 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-10 04:27  mkrufky
+
+	* linux/Documentation/video4linux/CARDLIST.bttv:
+	* linux/drivers/media/video/bttv-cards.c:
+	* linux/drivers/media/video/bttv-input.c: (bttv_input_init):
+	* linux/drivers/media/video/bttv.h:
+	- Add card MagicTV (rebranded MachTV)
+
+	Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2006-01-09 23:58  pascoe
 
 	* linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_irq):
-- 
cgit v1.2.3