Merge branch 'devel-for-v3.10' into v4l_for_linus

* patchwork: (831 commits)
  [media] cx88: make core less verbose
  [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
  [media] s5c73m3: fix indentation of the help section in Kconfig
  [media] cx25821-alsa: get rid of a __must_check warning
  [media] cx25821-video: declare cx25821_vidioc_s_std as static
  [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
  [media] r820t: Remove a warning for an unused value
  [media] dib0090: Fix a warning at dib0090_set_EFUSE
  [media] dib8000: fix a warning
  [media] dib8000: Fix sub-channel range
  [media] dib8000: store dtv_property_cache in a temp var
  [media] dib8000: warning fix: declare internal functions as static
  [media] r820t: quiet gcc warning on n_ring
  [media] r820t: memory leak in release()
  [media] r820t: precendence bug in r820t_xtal_check()
  [media] videodev2.h: Remove the unused old V4L1 buffer types
  [media] anysee: Grammar s/report the/report to/
  [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
  [media] media: videobuf2: fix the length check for mmap
  [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
  ...

Conflicts:
	drivers/media/pci/cx25821/cx25821-video.c
	drivers/media/platform/Kconfig

diff --combined MAINTAINERS
index 8bdd7a7,4cf48e3..d66ac19
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2284,7 -2284,7 +2284,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Maintained
- F:    drivers/media/i2c/cx2341x*
+ F:    drivers/media/common/cx2341x*
  F:    include/media/cx2341x*
  
  CX88 VIDEO4LINUX DRIVER
@@@ -2367,6 -2367,16 +2367,16 @@@ W:    http://www.cyclades.com
  S:    Orphan
  F:    drivers/net/wan/pc300*
  
+ CYPRESS_FIRMWARE MEDIA DRIVER
+ M:    Antti Palosaari <crope@iki.fi>
+ L:    linux-media@vger.kernel.org
+ W:    http://linuxtv.org/
+ W:    http://palosaari.fi/linux/
+ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
+ T:    git git://linuxtv.org/anttip/media_tree.git
+ S:    Maintained
+ F:    drivers/media/common/cypress_firmware*
+ 
  CYTTSP TOUCHSCREEN DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-input@vger.kernel.org
@@@ -2731,7 -2741,7 +2741,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/dvb-usb/cxusb*
  
- DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
+ DVB_USB_EC168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
@@@ -2739,17 -2749,16 +2749,16 @@@ W:   http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
- F:    drivers/media/usb/dvb-usb-v2/cypress_firmware*
+ F:    drivers/media/usb/dvb-usb-v2/ec168*
  
- DVB_USB_EC168 MEDIA DRIVER
+ DVB_USB_GL861 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
- W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
- F:    drivers/media/usb/dvb-usb-v2/ec168*
+ F:    drivers/media/usb/dvb-usb-v2/gl861*
  
  DVB_USB_MXL111SF MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
@@@ -3593,6 -3602,14 +3602,14 @@@ W:    http://www.kernel.org/pub/linux/kern
  S:    Maintained
  F:    drivers/platform/x86/hdaps.c
  
+ HDPVR USB VIDEO ENCODER DRIVER
+ M:    Hans Verkuil <hverkuil@xs4all.nl>
+ L:    linux-media@vger.kernel.org
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Odd Fixes
+ F:    drivers/media/usb/hdpvr
+ 
  HWPOISON MEMORY FAILURE HANDLING
  M:    Andi Kleen <andi@firstfloor.org>
  L:    linux-mm@kvack.org
@@@ -4422,6 -4439,16 +4439,16 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/it913x-fe*
  
+ IT913X MEDIA DRIVER
+ M:    Antti Palosaari <crope@iki.fi>
+ L:    linux-media@vger.kernel.org
+ W:    http://linuxtv.org/
+ W:    http://palosaari.fi/linux/
+ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
+ T:    git git://linuxtv.org/anttip/media_tree.git
+ S:    Maintained
+ F:    drivers/media/tuners/it913x*
+ 
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -4941,12 -4968,6 +4968,12 @@@ W:    logfs.or
  S:    Maintained
  F:    fs/logfs/
  
 +LPC32XX MACHINE SUPPORT
 +M:    Roland Stigge <stigge@antcom.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-lpc32xx/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
  M:    Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
@@@ -5071,8 -5092,9 +5098,8 @@@ S:      Maintaine
  F:    drivers/net/ethernet/marvell/sk*
  
  MARVELL LIBERTAS WIRELESS DRIVER
 -M:    Dan Williams <dcbw@redhat.com>
  L:    libertas-dev@lists.infradead.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wireless/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
@@@ -5574,7 -5596,6 +5601,7 @@@ F:      include/uapi/linux/if_
  F:    include/uapi/linux/netdevice.h
  
  NETXEN (1/10) GbE SUPPORT
 +M:    Manish Chopra <manish.chopra@qlogic.com>
  M:    Sony Chacko <sony.chacko@qlogic.com>
  M:    Rajesh Borundia <rajesh.borundia@qlogic.com>
  L:    netdev@vger.kernel.org
@@@ -6631,7 -6652,7 +6658,7 @@@ S:      Supporte
  F:    fs/reiserfs/
  
  REGISTER MAP ABSTRACTION
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -6692,6 -6713,16 +6719,16 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/dvb-frontends/rtl2830*
  
+ RTL2832 MEDIA DRIVER
+ M:    Antti Palosaari <crope@iki.fi>
+ L:    linux-media@vger.kernel.org
+ W:    http://linuxtv.org/
+ W:    http://palosaari.fi/linux/
+ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
+ T:    git git://linuxtv.org/anttip/media_tree.git
+ S:    Maintained
+ F:    drivers/media/dvb-frontends/rtl2832*
+ 
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
@@@ -6794,7 -6825,7 +6831,7 @@@ L:      linux-media@vger.kernel.or
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
- F:    Documentation/video4linux/saa7134/
+ F:    Documentation/video4linux/*.saa7134
  F:    drivers/media/pci/saa7134/
  
  SAA7146 VIDEO4LINUX-2 DRIVER
@@@ -6887,9 -6918,8 +6924,8 @@@ F:      drivers/clocksourc
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
- M:    Kang Yong <kangyong@telegent.com>
- M:    Zhang Xiaobing <xbzhang@telegent.com>
- S:    Supported
+ M:    Hans Verkuil <hverkuil@xs4all.nl>
+ S:    Odd Fixes
  F:    drivers/media/usb/tlg2300
  
  SC1200 WDT DRIVER
@@@ -6957,6 -6987,7 +6993,6 @@@ F:      drivers/scsi/st
  
  SCTP PROTOCOL
  M:    Vlad Yasevich <vyasevich@gmail.com>
 -M:    Sridhar Samudrala <sri@us.ibm.com>
  M:    Neil Horman <nhorman@tuxdriver.com>
  L:    linux-sctp@vger.kernel.org
  W:    http://lksctp.sourceforge.net
@@@ -7135,17 -7166,43 +7171,43 @@@ F:   drivers/media/radio/si470x/radio-si4
  F:    drivers/media/radio/si470x/radio-si470x.h
  F:    drivers/media/radio/si470x/radio-si470x-usb.c
  
+ SI4713 FM RADIO TRANSMITTER I2C DRIVER
+ M:    Eduardo Valentin <edubezval@gmail.com>
+ L:    linux-media@vger.kernel.org
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Odd Fixes
+ F:    drivers/media/radio/si4713-i2c.?
+ 
+ SI4713 FM RADIO TRANSMITTER PLATFORM DRIVER
+ M:    Eduardo Valentin <edubezval@gmail.com>
+ L:    linux-media@vger.kernel.org
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Odd Fixes
+ F:    drivers/media/radio/radio-si4713.h
+ 
+ SIANO DVB DRIVER
+ M:    Mauro Carvalho Chehab <mchehab@redhat.com>
+ L:    linux-media@vger.kernel.org
+ W:    http://linuxtv.org
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Odd fixes
+ F:    drivers/media/common/siano/
+ F:    drivers/media/dvb/siano/
+ F:    drivers/media/usb/siano/
+ F:    drivers/media/mmc/siano
+ 
  SH_VEU V4L2 MEM2MEM DRIVER
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/sh_veu.c
- F:    include/media/sh_veu.h
  
  SH_VOU V4L2 OUTPUT DRIVER
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
- S:    Maintained
+ S:    Odd Fixes
  F:    drivers/media/platform/sh_vou.c
  F:    include/media/sh_vou.h
  
@@@ -7187,14 -7244,13 +7249,13 @@@ F:   arch/arm/mach-davinc
  F:    drivers/i2c/busses/i2c-davinci.c
  
  TI DAVINCI SERIES MEDIA DRIVER
- M:    Manjunath Hadli <manjunath.hadli@ti.com>
- M:    Prabhakar Lad <prabhakar.lad@ti.com>
+ M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
  L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
- S:    Supported
+ S:    Maintained
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
@@@ -7379,7 -7435,7 +7440,7 @@@ F:      sound
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
@@@ -7468,7 -7524,7 +7529,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -7566,6 -7622,11 +7627,11 @@@ M:    David Täht <d@teklibre.com
  S:    Odd Fixes
  F:    drivers/staging/frontier/
  
+ STAGING - GO7007 MPEG CODEC
+ M:    Hans Verkuil <hans.verkuil@cisco.com>
+ S:    Maintained
+ F:    drivers/staging/media/go7007/
+ 
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <jic23@cam.ac.uk>
  L:    linux-iio@vger.kernel.org
@@@ -7616,8 -7677,8 +7682,8 @@@ S:      Odd Fixe
  F:    drivers/staging/sm7xxfb/
  
  STAGING - SOFTLOGIC 6x10 MPEG CODEC
- M:    Ben Collins <bcollins@bluecherry.net>
- S:    Odd Fixes
+ M:    Ismael Luceno <ismael.luceno@corp.bluecherry.net>
+ S:    Supported
  F:    drivers/staging/media/solo6x10/
  
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
@@@ -8713,7 -8774,7 +8779,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@ti.com>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git

diff --combined drivers/media/platform/Kconfig
index a0639e7,ae89545..73ecb2c
--- 1/drivers/media/platform/Kconfig
--- 2/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@@ -122,7 -122,7 +122,7 @@@ config VIDEO_S3C_CAMI
          will be called s3c-camif.
  
  source "drivers/media/platform/soc_camera/Kconfig"
- source "drivers/media/platform/s5p-fimc/Kconfig"
+ source "drivers/media/platform/exynos4-is/Kconfig"
  source "drivers/media/platform/s5p-tv/Kconfig"
  
  endif # V4L_PLATFORM_DRIVERS
@@@ -204,7 -204,7 +204,7 @@@ config VIDEO_SAMSUNG_EXYNOS_GS
  
  config VIDEO_SH_VEU
        tristate "SuperH VEU mem2mem video processing driver"
 -      depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
 +      depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help

diff --combined drivers/media/radio/radio-ma901.c
index 348dafc,18320c2..a85b064
--- 1/drivers/media/radio/radio-ma901.c
--- 2/drivers/media/radio/radio-ma901.c
+++ b/drivers/media/radio/radio-ma901.c
@@@ -239,7 -239,7 +239,7 @@@ static int vidioc_g_tuner(struct file *
  
  /* vidioc_s_tuner - set tuner attributes */
  static int vidioc_s_tuner(struct file *file, void *priv,
-                               struct v4l2_tuner *v)
+                               const struct v4l2_tuner *v)
  {
        struct ma901radio_device *radio = video_drvdata(file);
  
@@@ -257,7 -257,7 +257,7 @@@
  
  /* vidioc_s_frequency - set tuner radio frequency */
  static int vidioc_s_frequency(struct file *file, void *priv,
-                               struct v4l2_frequency *f)
+                               const struct v4l2_frequency *f)
  {
        struct ma901radio_device *radio = video_drvdata(file);
  
@@@ -347,20 -347,9 +347,20 @@@ static void usb_ma901radio_release(stru
  static int usb_ma901radio_probe(struct usb_interface *intf,
                                const struct usb_device_id *id)
  {
 +      struct usb_device *dev = interface_to_usbdev(intf);
        struct ma901radio_device *radio;
        int retval = 0;
  
 +      /* Masterkit MA901 usb radio has the same USB ID as many others
 +       * Atmel V-USB devices. Let's make additional checks to be sure
 +       * that this is our device.
 +       */
 +
 +      if (dev->product && dev->manufacturer &&
 +              (strncmp(dev->product, "MA901", 5) != 0
 +              || strncmp(dev->manufacturer, "www.masterkit.ru", 16) != 0))
 +              return -ENODEV;
 +
        radio = kzalloc(sizeof(struct ma901radio_device), GFP_KERNEL);
        if (!radio) {
                dev_err(&intf->dev, "kzalloc for ma901radio_device failed\n");