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

[jlayton/linux.git] / Documentation / devicetree / bindings / property-units.txt

diff --git a/Documentation/devicetree/bindings/property-units.txt b/Documentation/devicetree/bindings/property-units.txt
index 7c9f6ee918f14f7cf5c8dc29cf31757c42d2b7a8..45ce054d844d4deb4d3dea2f2fbcc17e14251dd8 100644 (file)
--- a/Documentation/devicetree/bindings/property-units.txt
+++ b/Documentation/devicetree/bindings/property-units.txt
@@ -25,8 +25,10 @@ Distance
 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