linux_old1/drivers/media/video/uvc
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
..
Kconfig V4L/DVB (11439): UVC: uvc_status_cleanup(): undefined reference to `input_unregister_device' 2009-04-06 21:44:52 -03:00
Makefile [media] uvcvideo: Register subdevices for each entity 2011-05-25 19:50:58 -03:00
uvc_ctrl.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
uvc_driver.c [media] uvcvideo: Add a mapping for H.264 payloads 2011-09-23 20:07:59 -03:00
uvc_entity.c [media] uvcvideo: Fix crash when linking entities 2011-09-21 22:18:07 -03:00
uvc_isight.c [media] uvcvideo: Update e-mail address and copyright notices 2010-10-21 01:18:18 -02:00
uvc_queue.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
uvc_status.c [media] uvcvideo: Update e-mail address and copyright notices 2010-10-21 01:18:18 -02:00
uvc_v4l2.c [media] uvcvideo: Remove deprecated UVCIOC ioctls 2011-09-23 20:06:51 -03:00
uvc_video.c [media] media: Fix a UVC performance problem on systems with non-coherent DMA 2011-09-23 20:07:47 -03:00
uvcvideo.h [media] uvcvideo: Add a mapping for H.264 payloads 2011-09-23 20:07:59 -03:00