Linus Torvalds 2d5e3e8d28 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb ... * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits) V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix V4L/DVB (7782): pvrusb2: Driver is no longer experimental V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2 V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug Rename common tuner Kconfig names to use the same Fix V4L/DVB core help messages V4L/DVB (7769): Move other terrestrial tuners to common/tuners V4L/DVB (7768): reorganize some DVB-S Kconfig items V4L/DVB(7767): Move tuners to common/tuners V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6 V4L/DVB (7765): Add support for Beholder BeholdTV H6 V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116 V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms V4L/DVB (7759): ivtv: increase version number to 1.2.1 ...		2008-04-29 14:53:40 -07:00
..
common	V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules	2008-04-29 18:41:42 -03:00
dvb	V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix	2008-04-29 18:41:41 -03:00
radio	V4L/DVB (7582): proc: switch /proc/driver/radio-typhoon to seq_file interface	2008-04-24 14:09:40 -03:00
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb	2008-04-29 14:53:40 -07:00
Kconfig	Fix V4L/DVB core help messages	2008-04-29 18:41:38 -03:00
Makefile	V4L/DVB(7767): Move tuners to common/tuners	2008-04-29 18:41:37 -03:00