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
..
ivtv-cards.c	[media] ivtv: Add Adaptec Remote Controller	2010-12-30 12:17:08 -02:00
ivtv-cards.h	[media] ivtv: Add Adaptec Remote Controller	2010-12-30 12:17:08 -02:00
ivtv-controls.c	V4L/DVB: ivtv: convert to the new control framework	2010-08-08 23:43:06 -03:00
ivtv-controls.h	V4L/DVB: ivtv: convert to the new control framework	2010-08-08 23:43:06 -03:00
ivtv-driver.c	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
ivtv-driver.h	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-fileops.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-fileops.h
ivtv-firmware.c	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-firmware.h	V4L/DVB: ivtv: Add firmare monitoring and debug mode to ignore firmware problems	2010-08-02 14:47:55 -03:00
ivtv-gpio.c	V4L/DVB: ivtv: convert gpio subdev to new control framework	2010-08-08 23:43:05 -03:00
ivtv-gpio.h
ivtv-i2c.c	[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap	2011-03-22 19:24:17 -03:00
ivtv-i2c.h	[media] video: Drop undue references to i2c-algo-bit	2011-11-24 15:11:17 -02:00
ivtv-ioctl.c	[media] ivtv: switch to the v4l core lock	2012-01-16 09:59:43 -02:00
ivtv-ioctl.h	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-irq.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-irq.h
ivtv-mailbox.c	V4L/DVB: ivtv: Automatic firmware reload	2010-08-02 14:48:13 -03:00
ivtv-mailbox.h	V4L/DVB: ivtv: Automatic firmware reload	2010-08-02 14:48:13 -03:00
ivtv-queue.c
ivtv-queue.h
ivtv-routing.c
ivtv-routing.h
ivtv-streams.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-streams.h
ivtv-udma.c	[media] ivtv: udma: handle get_user_pages() returning fewer pages than we asked for	2011-03-21 20:32:33 -03:00
ivtv-udma.h
ivtv-vbi.c	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-vbi.h	[media] ivtv: Return EFAULT when copy_from_user() fails in ivtv_write_vbi_from_user()	2010-12-29 08:17:10 -02:00
ivtv-version.h	[media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP	2011-07-27 17:53:14 -03:00
ivtv-yuv.c	[media] ivtv: switch to the v4l core lock	2012-01-16 09:59:43 -02:00
ivtv-yuv.h
ivtvfb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
Kconfig	[media] rc: rename the remaining things to rc_core	2010-12-29 08:16:50 -02:00
Makefile	[media] drivers/media: do not use EXTRA_CFLAGS	2011-09-03 18:50:59 -03:00