Linus Torvalds 1eb6337835 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: (348 commits) [media] pctv452e: Remove bogus code [media] adv7175: Make use of media bus pixel codes [media] media: vb2: fix incorrect return value [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES [media] cx23885: Stop the risc video fifo before reconfiguring it [media] cx23885: Avoid incorrect error handling and reporting [media] cx23885: Avoid stopping the risc engine during buffer timeout [media] cx23885: Removed a spurious function cx23885_set_scale() [media] cx23885: v4l2 api compliance, set the audioset field correctly [media] cx23885: hook the audio selection functions into the main driver [media] cx23885: add generic functions for dealing with audio input selection [media] cx23885: fixes related to maximum number of inputs and range checking [media] cx23885: Initial support for the MPX-885 mini-card [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use [media] cx23885: Enable audio line in support from the back panel [media] cx23885: Allow the audio mux config to be specified on a per input basis [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs [media] cx23885: Name an internal i2c part and declare a bitfield by name [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming [media] cx23885: remove channel dump diagnostics when a vbi buffer times out ... Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header file rename vs add)		2011-10-31 15:42:54 -07:00
..
demux.h	V4L/DVB (8131): dmx_write: memcpy from user-supplied pointer	2008-07-20 07:13:27 -03:00
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	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
dvb_ca_en50221.h	V4L/DVB (9054): implement proper locking in the dvb ca en50221 driver	2009-01-29 08:35:37 -02:00
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	V4L/DVB (13271): TS speed check. Logging transport stream speed in Kbits per second	2009-12-05 18:41:11 -02:00
dvb_filter.c
dvb_filter.h
dvb_frontend.c	[media] dvb_frontend: fix compile warning	2011-09-06 14:46:59 -03:00
dvb_frontend.h	[media] dvb-core, tda18271c2dd: define get_if_frequency() callback	2011-09-03 12:46:33 -03:00
dvb_math.c
dvb_math.h
dvb_net.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07: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	V4L/DVB (8130): split dvb_ringbuffer dual-use functions	2008-07-20 07:13:23 -03:00
dvbdev.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07: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