Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[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 0849618a9df032d13dbd3137b42c53e71dbbc64e..45ce054d844d4deb4d3dea2f2fbcc17e14251dd8 100644 (file)
--- a/Documentation/devicetree/bindings/property-units.txt
+++ b/Documentation/devicetree/bindings/property-units.txt
@@ -30,6 +30,7 @@ Electricity
 -micro-ohms    : micro Ohms
 -microwatt-hours: micro Watt-hours
 -microvolt     : micro volts
+-picofarads    : picofarads
 
 Temperature
 ----------------------------------------