From: Linus Torvalds Date: Wed, 23 Sep 2009 22:20:16 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: v2.6.32-rc1~151 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e56d49390cd161f34cc049a3661045183d276d5;p=platform%2Fkernel%2Flinux-stable.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: (ltc4245) Clear faults at startup hwmon: (ltc4215) Clear faults at startup hwmon: (coretemp) Add Lynnfield CPU hwmon: (coretemp) Add support for Penryn mobile CPUs hwmon: (coretemp) Fix Atom CPUs support hwmon: Delete deprecated FSC drivers hwmon: (adm1031) Add sysfs files for temperature offsets --- 3e56d49390cd161f34cc049a3661045183d276d5