Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Apr 2012 18:16:53 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Apr 2012 18:16:53 +0000 (11:16 -0700)
commit310eb776501af8412c570c4bcddc9ab5cecf3d7a
tree26c205905566fabbae0559605c46df3efb086fb8
parent277b5fb35b770792f89fbe50df03daddb3fa9521
parent1196573fe493aeeb826468157313ee84ffbc59f3
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pyll hwmon fixes from Guenter Roeck:
 "Two patches: Fix build warning in ads1015 driver, and fix bogus power
  values with current BIOSes in fam15h_power driver."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ads1015) Fix build warning
  hwmon: fam15h_power: fix bogus values with current BIOSes