Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 17:21:21 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 17:21:21 +0000 (10:21 -0700)
commit3110df800c4de2724624d46e6bed27efc5e9a707
tree7285520054f5fb5e154c8f71c9232f8b63cca417
parent375d0c0e70cf788fa74c658e5dd619a7abb7c5f7
parent7e97bbba62754ea86e191b99c6978476198ecb99
Merge branch 'hwmon-for-linus' of git://git./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