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
..
audiochip.h
cs53l32a.h
cs5345.h	V4L/DVB (6869): cs5345: new i2c driver	2008-01-25 19:04:08 -02:00
cx2341x.h	V4L/DVB (6861): cx2341x: command argument should be u32 instead of int	2008-01-25 19:04:04 -02:00
cx25840.h	V4L/DVB (7002): cx25840: Add basic CX23885 AVCore support	2008-01-25 19:04:47 -02:00
i2c-addr.h
ir-common.h	V4L/DVB (7677): saa7134: Add/fix Beholder entries	2008-04-24 14:09:46 -03:00
ir-kbd-i2c.h
m52790.h	V4L/DVB (6486): m52790: add new Mitsubishi A/V switch i2c driver	2008-01-25 19:01:46 -02:00
msp3400.h
ovcamchip.h
pwc-ioctl.h
rds.h	include/media/: Spelling fixes	2008-02-03 17:19:47 +02:00
saa6752hs.h
saa7115.h
saa7127.h
saa7146_vv.h	V4L/DVB (6496): saa7146_vv.h: remove wrong include <linux/videodev.h>	2008-01-25 19:01:52 -02:00
saa7146.h	[PATCH] Fix breakage after SG cleanups	2007-10-23 12:02:39 -07:00
soc_camera.h	V4L/DVB (7501): soc-camera: use a spinlock for videobuffer queue	2008-04-24 14:07:57 -03:00
tuner-types.h	V4L/DVB (7352): tuner-simple: enable digital tuning support for Philips FMD1216ME	2008-04-24 14:07:50 -03:00
tuner.h	V4L/DVB (7381): tuner: rename TUNER_PHILIPS_ATSC to TUNER_PHILIPS_FCV1236D	2008-04-24 14:07:52 -03:00
tvaudio.h
tveeprom.h
tvp5150.h
upd64031a.h
upd64083.h
v4l2-chip-ident.h	V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip	2008-04-29 18:41:41 -03:00
v4l2-common.h	i2c: Add support for device alias names	2008-04-29 23:11:39 +02:00
v4l2-dev.h	V4L/DVB (7665): videodev: Add default vidioc handler	2008-04-24 14:09:45 -03:00
v4l2-i2c-drv-legacy.h	i2c: Add support for device alias names	2008-04-29 23:11:39 +02:00
v4l2-i2c-drv.h	i2c: Add support for device alias names	2008-04-29 23:11:39 +02:00
v4l2-int-device.h	V4L/DVB (6580): Set slave's master before master's attach call.	2008-01-25 19:02:06 -02:00
videobuf-core.h	V4L/DVB (7566): videobuf-dvb: allow its usage with videobuf-vmalloc	2008-04-24 14:09:39 -03:00
videobuf-dma-sg.h	V4L/DVB (7554): videobuf-dma-sg: Remove unused flag	2008-04-24 14:08:48 -03:00
videobuf-dvb.h	V4L/DVB (7538): Adds selectable adapter numbers as per module option	2008-04-24 14:08:00 -03:00
videobuf-vmalloc.h	V4L/DVB (7566): videobuf-dvb: allow its usage with videobuf-vmalloc	2008-04-24 14:09:39 -03:00
wm8775.h