Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:26:44 +0000 (08:26 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:26:44 +0000 (08:26 +0700)
commit93a11c8f5cc642571071a1609a83998db1373077
tree0f6f910f9680c1de2ea72c07ed818c96158384c7
parent9826dbb1e9bdea2aa909a152733c663a8c773754
parent3f9aec7610b39521c7c69d754de7265f6994c194
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix attribute length problem in coretemp driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Fix truncated name of alarm attributes