Merge remote-tracking branch 'regulator/fix/max8997' into regulator-l…

…inus
git-mirror · Jul 4, 2013 · 8d0509e · 8d0509e
2 parents 6febb5a + 489ccee
commit 8d0509e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
@@ -1,6 +1,6 @@
 * Maxim MAX8997 Voltage and Current Regulator
 
-The Maxim MAX8997 is a multi-function device which includes volatage and
+The Maxim MAX8997 is a multi-function device which includes voltage and
 current regulators, rtc, charger controller and other sub-blocks. It is
 interfaced to the host controller using a i2c interface. Each sub-block is
 addressed by the host system using different i2c slave address. This document