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


Trivial merge