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
..
audio.h	V4L/DVB (3375): Add AUDIO_GET_PTS and VIDEO_GET_PTS ioctls	19 years ago
ca.h	[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3	19 years ago
dmx.h	[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4	19 years ago
frontend.h	DVB (2444): Implement frontend-specific tuning and the ability to disable zigzag	19 years ago
net.h	…
osd.h	[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3	19 years ago
version.h	…
video.h	Merge branch 'origin'	19 years ago