From: Linus Torvalds Date: Mon, 29 Mar 2010 21:42:08 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: v2.6.34-rc3~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d54e2c0b0a03b0f05fc4f988323c858ec9d7740;p=platform%2Fkernel%2Flinux-3.10.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: (asc7621) Add X58 entry in Kconfig hwmon: (w83793) Saving negative errors in unsigned hwmon: (coretemp) Add missing newline to dev_warn() message hwmon: (coretemp) Fix cpu model output --- 9d54e2c0b0a03b0f05fc4f988323c858ec9d7740