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
..
common	V4L/DVB (3197a): IR keymaps are exported by the ir-common module now	2006-03-03 12:13:42 -03:00
dvb	Merge branch 'origin'	2006-03-21 08:52:18 -08:00
radio	V4L/DVB (3318b): sem2mutex: drivers/media/, #2	2006-02-07 06:49:14 -02:00
video	Merge branch 'origin'	2006-03-21 08:52:18 -08:00
Kconfig	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	[PATCH] dvb: avoid building empty built-in.o	2005-09-09 13:57:36 -07:00