Merge branch 'v4l_for_linus' into staging/for_v3.6
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 14 Jul 2012 18:45:44 +0000 (15:45 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 14 Jul 2012 18:45:44 +0000 (15:45 -0300)
commit931efdf58bd83af8d0578a6cc53421675daf6d41
tree30e441fe3e13fc8fcf9690bfe5222f404e19daa0
parent2cefabc00ffdc1f22f960df946ae41b163081d5e
parentec3ed85f926f4e900bc48cec6e72abbe6475321f
Merge branch 'v4l_for_linus' into staging/for_v3.6

* v4l_for_linus: (31 commits)
  [media] Revert "[media] V4L: JPEG class documentation corrections"
  [media] s5p-fimc: Add missing FIMC-LITE file operations locking
  [media] omap3isp: preview: Fix contrast and brightness handling
  [media] omap3isp: preview: Fix output size computation depending on input format
  [media] winbond-cir: Initialise timeout, driver_type and allowed_protos
  [media] winbond-cir: Fix txandrx module info
  [media] cx23885: Silence unknown command warnings
  [media] cx23885: add support for HVR-1255 analog (cx23888 variant)
  [media] cx23885: make analog support work for HVR_1250 (cx23885 variant)
  [media] cx25840: fix vsrc/hsrc usage on cx23888 designs
  [media] cx25840: fix regression in HVR-1800 analog audio
  [media] cx25840: fix regression in analog support hue/saturation controls
  [media] cx25840: fix regression in HVR-1800 analog support
  [media] s5p-mfc: Fixed setup of custom controls in decoder and encoder
  [media] cx231xx: don't DMA to random addresses
  [media] em28xx: fix em28xx-rc load
  [media] dvb-core: Release semaphore on error path dvb_register_device()
  [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails
  [media] s5p-fimc: Fix compiler warning in fimc-lite.c
  [media] s5p-fimc: media_entity_pipeline_start() may fail
  ...
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/omap3isp/isppreview.c
drivers/media/video/s5p-fimc/fimc-capture.c
drivers/media/video/s5p-fimc/fimc-core.c
drivers/media/video/s5p-fimc/fimc-lite.c
drivers/media/video/s5p-fimc/fimc-mdevice.c
drivers/media/video/smiapp/smiapp-core.c