tree 7f10ced67c135f460b8308249ffcc51a348052e6
parent 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
parent 8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
author Linus Torvalds <torvalds@linux-foundation.org> 1292362283 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292362283 -0800

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (adm1026) Allow 1 as a valid divider value
  hwmon: (adm1026) Fix setting fan_div
  hwmon: (it87) Fix manual fan speed control on IT8721F