From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2012 18:16:53 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.4-rc4~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=310eb776501af8412c570c4bcddc9ab5cecf3d7a;p=~emulex%2Finfiniband.git

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
---

310eb776501af8412c570c4bcddc9ab5cecf3d7a