From: Linus Torvalds Date: Thu, 15 Apr 2010 01:45:14 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: Ubuntu-5.13.0-19.19~32010 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f5c07a2d8acfc98e00d3be6298f979e5b3175953;p=mirror_ubuntu-jammy-kernel.git 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: (applesmc) Switch maintainers hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support hwmon: (it87) Invalidate cache on temperature sensor change hwmon: (it87) Properly handle wrong sensor type requests hwmon: (it87) Don't arbitrarily enable temperature channels hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n hwmon: (sht15) Fix sht15_calc_temp interpolation function --- f5c07a2d8acfc98e00d3be6298f979e5b3175953