From: Linus Torvalds Date: Fri, 16 Jan 2009 00:40:12 +0000 (-0800) Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Tag: v2.6.29-rc2~12 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7e92214b539ea17ccaf0886d140cbba9801a4d40;p=linux-2.6-omap-h63xx.git Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe hwmon: (abituguru3) Enable DMI probing feature on IN9 32X MAX hwmon: (abituguru3) Match partial DMI board name strings hwmon: Add a driver for the ADT7475 hardware monitoring chip hwmon: (k8temp) Fix temperature reporting for (most) K8 RevG CPUs hwmon: (k8temp) Fix wrong sensor selection for AMD K8 RevF/RevG CPUs hwmon: (k8temp) Warn about fam F rev F errata --- 7e92214b539ea17ccaf0886d140cbba9801a4d40