Merge remote-tracking branch 'net/master'

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / property-units.txt

diff --git a/Documentation/devicetree/bindings/property-units.txt b/Documentation/devicetree/bindings/property-units.txt
index 45ce054d844d4deb4d3dea2f2fbcc17e14251dd8..bfd33734facaba73c963e3e26351651b4f38fc5d 100644 (file)
--- a/Documentation/devicetree/bindings/property-units.txt
+++ b/Documentation/devicetree/bindings/property-units.txt
@@ -31,6 +31,7 @@ Electricity
 -microwatt-hours: micro Watt-hours
 -microvolt     : micro volts
 -picofarads    : picofarads
+-femtofarads   : femtofarads
 
 Temperature
 ----------------------------------------