Linus Torvalds 4a7c1ff236 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits) [media] as3645a: Fix compilation by including slab.h [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c [media] ds3000: using logical && instead of bitwise & [media] v4l2-ctrls: make control names consistent [media] DVB: dib0700, add support for Nova-TD LEDs [media] DVB: dib0700, add corrected Nova-TD frontend_attach [media] DVB: dib0700, separate stk7070pd initialization [media] DVB: dib0700, move Nova-TD Stick to a separate set [media] : add MODULE_FIRMWARE to dib0700 [media] DVB-CORE: remove superfluous DTV_CMDs [media] s5p-jpeg: adapt to recent videobuf2 changes [media] s5p-g2d: fixed a bug in controls setting function [media] s5p-mfc: Fix volatile controls setup [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test [media] s5p-fimc: Fix incorrect control ID assignment [media] dvb_frontend: Don't call get_frontend() if idle [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters ...		2012-01-18 12:53:54 -08:00
..
cx88-alsa.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
cx88-blackbird.c	[media] Stop using linux/version.h on most video drivers	2011-07-27 17:53:12 -03:00
cx88-cards.c	[media] cx88: fix: don't duplicate xc4000 entry for radio	2012-01-16 11:55:22 -02:00
cx88-core.c	[media] cx88: notch filter control fixes	2011-08-27 11:21:16 -03:00
cx88-dsp.c	V4L/DVB: drivers/media: Make static data tables and strings const	2010-10-21 01:04:52 -02:00
cx88-dvb.c	[media] cx88: Fix radio support for Leadtek DTV2000H J	2012-01-06 17:16:34 -02:00
cx88-i2c.c	[media] video: Drop undue references to i2c-algo-bit	2011-11-24 15:11:17 -02:00
cx88-input.c	[media] Add support for two Leadtek Winfast TV 2000XP types	2012-01-07 11:47:30 -02:00
cx88-mpeg.c	[media] cx88: properly maintain decoder config when using MPEG encoder	2011-07-27 17:56:00 -03:00
cx88-reg.h
cx88-tvaudio.c	[media] Add proper audio support for Nova-S Plus with wm8775 ADC	2011-03-21 20:32:19 -03:00
cx88-vbi.c	V4L/DVB: drivers/media: Make static data tables and strings const	2010-10-21 01:04:52 -02:00
cx88-video.c	[media] cx88: notch filter control fixes	2011-08-27 11:21:16 -03:00
cx88-vp3054-i2c.c	[media] cx88: Remove the obsolete i2c_adapter.id field	2010-12-30 12:17:19 -02:00
cx88-vp3054-i2c.h
cx88.h	[media] Add support for two Leadtek Winfast TV 2000XP types	2012-01-07 11:47:30 -02:00
Kconfig	[media] cx88: fix menu level for the VP-3054 module	2011-11-08 11:52:21 -02:00
Makefile	[media] drivers/media: do not use EXTRA_CFLAGS	2011-09-03 18:50:59 -03:00