From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jul 2011 17:21:21 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v3.0~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3110df800c4de2724624d46e6bed27efc5e9a707;p=~emulex%2Finfiniband.git

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (adm1275) Fix coefficients per datasheet revision B
  hwmon: (pmbus) Use long variables for register to data conversions
---

3110df800c4de2724624d46e6bed27efc5e9a707