From: Linus Torvalds Date: Tue, 17 Nov 2009 17:17:40 +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~11883 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee49a277e6daaa52e846be264246bd809d2c5fff;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: (adt7475) Fix sysfs file names hwmon: (adt7475) Cache limits for 60 seconds hwmon: (adt7475) Fix temperature fault flags hwmon: (s3c-hwmon) Ignore invalid divider settings --- ee49a277e6daaa52e846be264246bd809d2c5fff