From: Linus Torvalds Date: Mon, 18 Jun 2012 18:51:10 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: firefly_0821_release~3680^2~2592 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4005af65c918a57a03bb87ede13217a959fffc11;p=firefly-linux-kernel-4.4.55.git Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging Pull hwmon subsystem fixes from Jean Delvare. * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (coretemp) Drop needless initialization hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors hwmon: (coretemp) Improve support for TjMax detection on Atom CPUs hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models hwmon: (coretemp) Improve support of recent Atom CPU models --- 4005af65c918a57a03bb87ede13217a959fffc11