diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 07:09:18 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 07:09:18 (GMT) |
| commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
| tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /Documentation/hwmon/twl4030-madc-hwmon | |
| parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea.tar.xz | |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'Documentation/hwmon/twl4030-madc-hwmon')
| -rw-r--r-- | Documentation/hwmon/twl4030-madc-hwmon | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon index ef79843..c3a3a5b 100644 --- a/Documentation/hwmon/twl4030-madc-hwmon +++ b/Documentation/hwmon/twl4030-madc-hwmon @@ -41,5 +41,5 @@ Channel Signal The Sysfs nodes will represent the voltage in the units of mV, the temperature channel shows the converted temperature in -degree celcius. The Battery charging current channel represents +degree Celsius. The Battery charging current channel represents battery charging current in mA. |