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

* '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)

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/input/misc/Makefile
Simple merge

diff --cc drivers/media/dvb/dvb-usb/af9005.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/media/video/Kconfig
index 620106937ec6e51b56b0028f30ac6588d87b5c09,b80bea26af62c3d1fa06520260735c7131a74f1f..d285c8c92819472d0ec0bc3a13afe9821f0680fd
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -753,17 -775,10 +775,9 @@@ config VIDEO_VIA_CAMER
           Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
           with ov7670 sensors.
  
- config VIDEO_NOON010PC30
-       tristate "NOON010PC30 CIF camera sensor support"
-       depends on I2C && VIDEO_V4L2
-       ---help---
-         This driver supports NOON010PC30 CIF camera from Siliconfile
- 
- source "drivers/media/video/m5mols/Kconfig"
- 
  config VIDEO_OMAP3
        tristate "OMAP 3 Camera support (EXPERIMENTAL)"
 -      select OMAP_IOMMU
 -      depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
 +      depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
        ---help---
          Driver for an OMAP 3 camera controller.
  

diff --cc drivers/media/video/omap3isp/isp.c
Simple merge

diff --cc drivers/media/video/omap3isp/isp.h
Simple merge

diff --cc drivers/media/video/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispvideo.c
Simple merge

diff --cc drivers/misc/altera-stapl/altera.c
index c2eff6a82db1fb3699f9a50f33085607f15ff44e,1a2c50b82f94aa219a998ccd7ddb16934a21a942..24272e022bec926f729d6cf26fd5953e63316ad7
--- 1/drivers/staging/altera-stapl/altera.c
--- 2/drivers/misc/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@@ -28,8 -28,7 +28,8 @@@
  #include <linux/string.h>
  #include <linux/firmware.h>
  #include <linux/slab.h>
- #include "altera.h"
 +#include <linux/module.h>
+ #include <misc/altera.h>
  #include "altera-exprt.h"
  #include "altera-jtag.h"
  

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/dt3155v4l/dt3155v4l.c
Simple merge