From: Linus Torvalds Date: Tue, 14 Dec 2010 21:31:23 +0000 (-0800) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: firefly_0821_release~7613^2~3262 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4;p=firefly-linux-kernel-4.4.55.git 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 --- d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4