From: Linus Torvalds Date: Tue, 28 Sep 2010 19:13:13 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... X-Git-Tag: firefly_0821_release~9833^2~398 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4d32648c190711177a664af7d51149a8950555e;p=firefly-linux-kernel-4.4.55.git Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon (coretemp): Fix build breakage if SMP is undefined --- b4d32648c190711177a664af7d51149a8950555e