Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 20:40:40 +0000 (13:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 20:40:40 +0000 (13:40 -0700)
commit26affb2cd3f2f02b0e56694e9f1d965f0753ab8f
treea22e9d373ec5d85343094320acbdcbe238b534da
parentd8ab424f9ca4550b1623734000a8259e09b40b75
parentc7ae295df6a0290e9d29c00f1bc52a1f96f87165
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Two minor fixes in emc2103 and applesmc drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (emc2103) Fix use of an uninitilized variable in error case
  hwmon: (applesmc) Limit key length in warning messages