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
..
demux.h
dmxdev.c	[media] dmxdev: Fix a compilation warning due to a bad type	2010-12-29 08:17:13 -02:00
dmxdev.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dvb_ca_en50221.c	[media] dvb_ca_en50221: fix compilation breakage	2012-01-10 19:15:45 -02:00
dvb_ca_en50221.h
dvb_demux.c	[media] Speed up DVB TS stream delivery from DMA buffer into dvb-core's buffer	2011-05-20 09:28:48 -03:00
dvb_demux.h
dvb_filter.c
dvb_filter.h
dvb_frontend.c	[media] DVB-CORE: remove superfluous DTV_CMDs	2012-01-17 22:58:40 -02:00
dvb_frontend.h	[media] dvb-core: define general callback value for demodulator	2012-01-10 22:58:39 -02:00
dvb_math.c
dvb_math.h
dvb_net.c	[media] DVB: dvb_net_init: return -errno on error	2012-01-06 12:40:46 -02:00
dvb_net.h	dvb_net: Simplify the code if DVB NET is not defined	2011-07-27 17:52:20 -03:00
dvb_ringbuffer.c	V4L/DVB: DVB: Export dvb_ringbuffer_flush() again	2010-02-26 15:10:54 -03:00
dvb_ringbuffer.h
dvbdev.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
dvbdev.h	dvb: Push down BKL into ioctl functions	2010-05-17 05:27:04 +02:00
Makefile	[media] Make DVB NET configurable in the kernel	2011-07-27 17:52:20 -03:00