From: Linus Torvalds Date: Sun, 26 Oct 2008 16:36:19 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Tag: v2.6.28-rc2~6 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=b1cd2ee3b95f1c3108c68c82342c614e58ce1f13 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) enable DMI probing feature on AW9D-MAX hwmon: (abituguru3) Cosmetic whitespace fixes hwmon: (adt7473) Fix voltage conversion routines hwmon: (lm90) Add support for the LM99 16 degree offset hwmon: (lm90) Fix handling of hysteresis value hwmon-vid: Add support for AMD family 10h CPUs hwmon: (w83781d) Fix linking when built-in --- b1cd2ee3b95f1c3108c68c82342c614e58ce1f13