Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

* '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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
index 4131e253f96a17b551c6d5fccfb5323d73029296,312b7c39d9f4f000371a0b40bc69d100f1847ada..450c8e89427794558fe34feed87004cc3c8605e0
--- 1/drivers/hwmon/Makefile
--- 2/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -53,9 -53,9 +53,10 @@@ obj-$(CONFIG_SENSORS_IBMAEM) += ibmaem.
  obj-$(CONFIG_SENSORS_IBMPEX)  += ibmpex.o
  obj-$(CONFIG_SENSORS_IT87)    += it87.o
  obj-$(CONFIG_SENSORS_K8TEMP)  += k8temp.o
+ obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o
  obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
  obj-$(CONFIG_SENSORS_LIS3_SPI)        += lis3lv02d.o lis3lv02d_spi.o
 +obj-$(CONFIG_SENSORS_LIS3_I2C)        += lis3lv02d.o lis3lv02d_i2c.o
  obj-$(CONFIG_SENSORS_LM63)    += lm63.o
  obj-$(CONFIG_SENSORS_LM70)    += lm70.o
  obj-$(CONFIG_SENSORS_LM73)    += lm73.o