Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2014 15:59:49 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2014 15:59:49 +0000 (08:59 -0700)
commitf4961366866ee34cf303b6951a5bad851be5b6fd
tree23e2fae7865287126d9cf79ee53b80a8add225a5
parent789ce9dca8007ab5d7c72b9a174a29243817ac32
parentc0940e95f7a78be0525c8d31df0b1f71e149e57e
Merge tag 'hwmon-for-linus' of git://git./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"