Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media fixes from Mauro Carvalho Chehab:
 - Some regression fixes at the audio part for devices with
   cx23885/cx25840
 - A DMA corruption fix at cx231xx
 - two fixes at the winbond IR driver
 - Several fixes for the EXYNOS media driver (s5p)
 - two fixes at the OMAP3 preview driver
 - one fix at the dvb core failure path
 - an include missing (slab.h) at smiapp-core causing compilation
   breakage
 - em28xx was not loading the IR driver driver anymore.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (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
  ...

diff --combined Documentation/DocBook/media/v4l/controls.xml
index 676bc46f9c52a476b3c8c280cca437d756726235,43ca749fc5e300e26771e5809b3e58247ba147ae..cda0dfb6769aee5d0fcadb8a30b4d19658259bc7
--- 1/Documentation/DocBook/media/v4l/controls.xml
--- 2/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@@ -2097,7 -2097,7 +2097,7 @@@ Possible values are:</entry
                <entry>integer</entry>
              </row>
              <row><entry spanname="descr">Cyclic intra macroblock refresh. This is the number of continuous macroblocks
 -refreshed every frame. Each frame a succesive set of macroblocks is refreshed until the cycle completes and starts from the
 +refreshed every frame. Each frame a successive set of macroblocks is refreshed until the cycle completes and starts from the
  top of the frame. Applicable to H264, H263 and MPEG4 encoder.</entry>
              </row>
  
@@@ -2257,7 -2257,7 +2257,7 @@@ Applicable to the MPEG4 and H264 encode
                <entry>integer</entry>
              </row>
              <row><entry spanname="descr">The Video Buffer Verifier size in kilobytes, it is used as a limitation of frame skip.
 -The VBV is defined in the standard as a mean to verify that the produced stream will be succesfully decoded.
 +The VBV is defined in the standard as a mean to verify that the produced stream will be successfully decoded.
  The standard describes it as "Part of a hypothetical decoder that is conceptually connected to the
  output of the encoder. Its purpose is to provide a constraint on the variability of the data rate that an
  encoder or editing process may produce.".
@@@ -2270,7 -2270,7 +2270,7 @@@ Applicable to the MPEG1, MPEG2, MPEG4 e
                <entry>integer</entry>
              </row>
              <row><entry spanname="descr">The Coded Picture Buffer size in kilobytes, it is used as a limitation of frame skip.
 -The CPB is defined in the H264 standard as a mean to verify that the produced stream will be succesfully decoded.
 +The CPB is defined in the H264 standard as a mean to verify that the produced stream will be successfully decoded.
  Applicable to the H264 encoder.</entry>
              </row>
  
@@@ -3988,7 -3988,7 +3988,7 @@@ interface and may change in the future.
            from RGB to Y'CbCr color space.
            </entry>
          </row>
-         <row id = "v4l2-jpeg-chroma-subsampling">
+         <row>
            <entrytbl spanname="descr" cols="2">
              <tbody valign="top">
                <row>