tree 7285520054f5fb5e154c8f71c9232f8b63cca417
parent 375d0c0e70cf788fa74c658e5dd619a7abb7c5f7
parent 7e97bbba62754ea86e191b99c6978476198ecb99
author Linus Torvalds <torvalds@linux-foundation.org> 1310750481 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310750481 -0700

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