| commit | f4961366866ee34cf303b6951a5bad851be5b6fd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 01 08:59:49 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 01 08:59:49 2014 -0700 |
| tree | 23e2fae7865287126d9cf79ee53b80a8add225a5 | |
| parent | 789ce9dca8007ab5d7c72b9a174a29243817ac32 [diff] | |
| parent | c0940e95f7a78be0525c8d31df0b1f71e149e57e [diff] |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fix from Guenter Roeck: "Fix Tjmax detection in coretemp driver" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: Revert "hwmon: (coretemp) Refine TjMax detection"