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)

1 files changed, 0 insertions, 23 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d5ac362daef5..7c799fc5b88e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -495,29 +495,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:   Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:   3.2
-Why:    The information passed to the driver by this ioctl is now queried
-        dynamically from the device.
-Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
-What:   Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:   3.2
-Why:    Used only by applications compiled against older driver versions.
-        Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
-Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
-What:   Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:   3.2
-Why:    Superseded by the UVCIOC_CTRL_QUERY ioctl.
-Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
 What:   Support for driver specific ioctls in the pwc driver (everything
         defined in media/pwc-ioctl.h)
 When:   3.3