You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		19 years ago
..
Kconfig	Merge branch 'origin'	19 years ago
Makefile	V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support	19 years ago
cx88-alsa.c	V4L/DVB (3318a): Makes Some symbols static.	19 years ago
cx88-blackbird.c	V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc	19 years ago
cx88-cards.c	V4L/DVB (3411): FE6600 is a Thomson tuner	19 years ago
cx88-core.c	V4L/DVB (3394): Bttv: correct bttv_risc_packed buffer size	19 years ago
cx88-dvb.c	V4L/DVB (3411): FE6600 is a Thomson tuner	19 years ago
cx88-i2c.c	V4L/DVB (3269): ioctls cleanups.	19 years ago
cx88-input.c	V4L/DVB (3297): Add IR support to KWorld DVB-T (cx22702-based)	19 years ago
cx88-mpeg.c	V4L (0979): Added V4L support for the Nova-S-Plus and Nova-SE2 DVB-S products	19 years ago
cx88-reg.h	[PATCH] v4l: 800: whitespace cleanups	20 years ago
cx88-tvaudio.c	V4L/DVB (3378): Fix for lack of analog output on some cx88 boards	19 years ago
cx88-vbi.c	[PATCH] v4l: CX88 updates and card additions	20 years ago
cx88-video.c	V4L/DVB (3393): Cx88: reduce excessive logging	19 years ago
cx88-vp3054-i2c.c	V4L/DVB (3356): Include missing MODULE_* macros	19 years ago
cx88-vp3054-i2c.h	V4L/DVB (3220): Add support for VP-3054 HDTV board	19 years ago
cx88.h	V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support	19 years ago