From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jul 2017 18:15:19 +0000 (-0700)
Subject: Merge tag 'media/v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b49ce5a40702bf78a5f80076312b244785e9a2f;p=openwrt%2Fstaging%2Fblogic.git

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

Pull media updates from Mauro Carvalho Chehab:

 - addition of fwnode support at V4L2 core

 - addition of a few more SDR formats

 - new imx driver to support i.MX6 cameras

 - new driver for Qualcon venus codecs

 - new I2C sensor drivers: dw9714, max2175, ov13858, ov5640

 - new CEC driver: stm32-cec

 - some improvements to DVB frontend documentation and a few fixups

 - several driver improvements and fixups

* tag 'media/v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (361 commits)
  [media] media: entity: Catch unbalanced media_pipeline_stop calls
  [media] media/uapi/v4l: clarify cropcap/crop/selection behavior
  [media] v4l2-ioctl/exynos: fix G/S_SELECTION's type handling
  [media] vimc: sen: Declare vimc_sen_video_ops as static
  [media] vimc: sca: Add scaler
  [media] vimc: deb: Add debayer filter
  [media] vimc: Subdevices as modules
  [media] vimc: cap: Support several image formats
  [media] vimc: sen: Support several image formats
  [media] vimc: common: Add vimc_colorimetry_clamp
  [media] vimc: common: Add vimc_link_validate
  [media] vimc: common: Add vimc_pipeline_s_stream helper
  [media] vimc: common: Add vimc_ent_sd_* helper
  [media] vimc: Move common code from the core
  [media] vimc: sen: Integrate the tpg on the sensor
  [media] media: i2c: ov772x: Force use of SCCB protocol
  [media] dvb uapi docs: enums are passed by value, not reference
  [media] dvb: don't use 'time_t' in event ioctl
  [media] media: venus: enable building with COMPILE_TEST
  [media] af9013: refactor power control
  ...
---

0b49ce5a40702bf78a5f80076312b244785e9a2f
diff --cc Documentation/devicetree/bindings/property-units.txt
index 0849618a9df0,7c9f6ee918f1..45ce054d844d
--- a/Documentation/devicetree/bindings/property-units.txt
+++ b/Documentation/devicetree/bindings/property-units.txt
@@@ -25,11 -25,10 +25,12 @@@ Distanc
  Electricity
  ----------------------------------------
  -microamp	: micro amps
 +-microamp-hours : micro amp-hours
  -ohms		: Ohms
  -micro-ohms	: micro Ohms
 +-microwatt-hours: micro Watt-hours
  -microvolt	: micro volts
+ -picofarads	: picofarads
  
  Temperature
  ----------------------------------------