commit e82b1dae2a8730c89e2a30c5c28562ef066f39d9
author Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 17 16:48:08 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 17 16:48:08 2009 -0800
tree 4811b7fd81c45d6d9b35bbd0519f8bc232dde616
parent fc6f0700d5cd54b5f8b30c4f0d93b06a6ba04b81
parent c46c0e9188685c0276b4c0adf9fb7e903937e35b

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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