From: Linus Torvalds Date: Fri, 18 Dec 2009 00:48:08 +0000 (-0800) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... X-Git-Tag: v2.6.33-rc1~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e82b1dae2a8730c89e2a30c5c28562ef066f39d9;p=pandora-kernel.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: (w83627hf) Fix for "No such device" hwmon: (sht15) Off-by-one error in array index + incorrect constants hwmon: Add driver for VIA CPU core temperature hwmon: (smsc47m1) Enable device if needed hwmon: (smsc47m1) Fail module loading on error hwmon: (smsc47m1) Only request I/O ports we really use hwmon: New driver for AMD Family 10h/11h CPUs --- e82b1dae2a8730c89e2a30c5c28562ef066f39d9 Reading git-diff-tree failed