linux/drivers/media/dvb
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
..
b2c2 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
bt8xx [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
ddbridge [media] ddbridge: fix compiler warnings 2011-09-06 14:42:59 -03:00
dm1105 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
dvb-core Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
dvb-usb Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
firewire [media] firedtv: change some -EFAULT returns to more fitting error codes 2011-07-27 17:53:38 -03:00
frontends Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
mantis [media] Refactor Mantis DMA transfer to deliver 16Kb TS data per interrupt 2011-09-25 08:43:06 -03:00
ngene [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
pluto2 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
pt1 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
siano Revert "[media] siano: apply debug flag to module level" 2011-09-26 16:50:14 -03:00
ttpci [media] stb0899: Removed an extra byte sent at init on DiSEqC bus 2011-09-25 08:41:23 -03:00
ttusb-budget [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
ttusb-dec [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
Kconfig [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00
Makefile [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00