From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 00:55:48 +0000 (-0700)
Subject: Merge tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.14-rc1~5182
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b4ca4447757019f11a601b0009534ef84bed801;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'media/v4.2-1' of git://git./linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - Lots of improvements at the DVB API DocBook documentation.  Now, the
   frontend and the network APIs are fully in sync with the Kernel and
   looks more like the rest of the media documentation;

 - New frontend driver: cx24120

 - New driver for a PCI device: cobalt.  This driver is actually not
   sold in the market, but it is a good example of a multi-HDMI input
   device;

 - The dt3155 driver were promoted from staging;

 - The mantis driver got remote controller support;

 - New V4L2 driver for ST bdisp SoC chipsets;

 - Make sparse and smatch happier: several bugs were solved by fixing
   the issues reported by those static code analyzers.

 - Lots of new device additions, new features, improvements and cleanups
   at the existing drivers.

* tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (553 commits)
  [media] lmedm04: fix the range for relative measurements
  [media] lmedm04: use u32 instead of u64 for relative stats
  [media] omap3isp: remove unused var
  [media] saa7134: fix page size on some archs
  [media] use CONFIG_PM_SLEEP for suspend/resume
  [media] tuner-i2c: be consistent with I2C declaration
  [media] si470x: cleanup define namespace
  [media] bdisp: prevent compiling on random arch
  [media] vb2: Don't WARN when v4l2_buffer.bytesused is 0 for multiplanar buffers
  [media] MAINTAINERS: Add entry for the Renesas VSP1 driver
  [media] videodev2.h: fix copy-and-paste error in V4L2_MAP_XFER_FUNC_DEFAULT
  [media] Revert "[media] vb2: Push mmap_sem down to memops"
  [media] mantis: cleanup a warning
  [media] bdisp-debug: don't try to divide by s64
  [media] cx88: don't declare restart_video_queue if not used
  [media] au0828: move dev->boards atribuition to happen earlier
  [media] lmedm04: implement dvb v5 statistics
  [media] bdisp: remove unused var
  [media] bdisp: remove needless check
  ts2020: fix compilation on i386
  ...
---

5b4ca4447757019f11a601b0009534ef84bed801
diff --cc drivers/media/Kconfig
index 1570992,8af89b0..3ef3d6c
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@@ -95,9 -95,8 +95,9 @@@ config MEDIA_CONTROLLE
  	  This API is mostly used by camera interfaces in embedded platforms.
  
  config MEDIA_CONTROLLER_DVB
- 	bool "Enable Media controller for DVB"
+ 	bool "Enable Media controller for DVB (EXPERIMENTAL)"
  	depends on MEDIA_CONTROLLER
 +	depends on BROKEN
  	---help---
  	  Enable the media controller API support for DVB.