Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:31:23 +0000 (13:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:31:23 +0000 (13:31 -0800)
commitd5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4
tree7f10ced67c135f460b8308249ffcc51a348052e6
parent5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
parent8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
Merge branch 'hwmon-for-linus' of git://git./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