diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 18:49:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 18:49:42 -0700 |
| commit | 112ccff716ae74ffa5f30266b29c4d72aab4074b (patch) | |
| tree | f6d5cbe0835975d4920f77a8511e874290071a1b /Documentation/hwmon/lm75 | |
| parent | 9997d08806062cb7ba471ab12fa2742cfec2f413 (diff) | |
| parent | 25eba81b7fbbb14dde63fc85231c699fe77afc58 (diff) | |
| download | linux-112ccff716ae74ffa5f30266b29c4d72aab4074b.tar.bz2 | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (lm75) Fix tcn75 prefix
hwmon: (lm75.h) Update header inclusion
MAINTAINERS: Remove Mark M. Hoffman
Diffstat (limited to 'Documentation/hwmon/lm75')
| -rw-r--r-- | Documentation/hwmon/lm75 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75 index c91a1d15fa28..69af1c7db6b7 100644 --- a/Documentation/hwmon/lm75 +++ b/Documentation/hwmon/lm75 @@ -23,7 +23,7 @@ Supported chips: Datasheet: Publicly available at the Maxim website http://www.maxim-ic.com/ * Microchip (TelCom) TCN75 - Prefix: 'lm75' + Prefix: 'tcn75' Addresses scanned: none Datasheet: Publicly available at the Microchip website http://www.microchip.com/ |