Linus Torvalds b05005772f Merge branch 'origin' ... Conflicts: Documentation/video4linux/CARDLIST.cx88 drivers/media/video/cx88/Kconfig drivers/media/video/em28xx/em28xx-video.c drivers/media/video/saa7134/saa7134-dvb.c Resolved as in the original merge by Mauro Carvalho Chehab		2006-03-21 08:52:18 -08:00
..
cx88-alsa.c	V4L/DVB (3318a): Makes Some symbols static.	2006-02-07 06:55:13 -02:00
cx88-blackbird.c	V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc	2006-01-11 19:40:56 -02:00
cx88-cards.c	V4L/DVB (3411): FE6600 is a Thomson tuner	2006-03-08 11:37:29 -03:00
cx88-core.c	V4L/DVB (3394): Bttv: correct bttv_risc_packed buffer size	2006-02-27 00:09:48 -03:00
cx88-dvb.c	V4L/DVB (3411): FE6600 is a Thomson tuner	2006-03-08 11:37:29 -03:00
cx88-i2c.c	V4L/DVB (3269): ioctls cleanups.	2006-01-09 15:32:31 -02:00
cx88-input.c	V4L/DVB (3297): Add IR support to KWorld DVB-T (cx22702-based)	2006-02-07 06:46:19 -02:00
cx88-mpeg.c
cx88-reg.h
cx88-tvaudio.c	V4L/DVB (3378): Fix for lack of analog output on some cx88 boards	2006-01-15 09:03:34 -02:00
cx88-vbi.c
cx88-video.c	V4L/DVB (3393): Cx88: reduce excessive logging	2006-02-27 00:09:45 -03:00
cx88-vp3054-i2c.c	V4L/DVB (3356): Include missing MODULE_* macros	2006-01-13 14:10:24 -02:00
cx88-vp3054-i2c.h	V4L/DVB (3220): Add support for VP-3054 HDTV board	2006-01-09 15:25:35 -02:00
cx88.h	V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support	2006-03-08 11:36:50 -03:00
Kconfig	Merge branch 'origin'	2006-03-21 08:52:18 -08:00
Makefile	V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support	2006-03-08 11:36:50 -03:00