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)
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"


Trivial merge