Merge tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull hwmon updates from Guenter Roeck:
 - new driver for menf21bmc.
 - convert k10temp, smsc47b397, da9052, da9055 to new hwmon API.
 - register ntc_thermistor driver with thermal subsystem.
 - add support for F15h M60h to k10temp driver.
 - add driver for MEN14F021P00 BMC HWMON driver; this required a merge
   with tag mfd-hwmon-leds-watchdog-v3.18

* tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
  hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver
  leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver
  watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog driver
  mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver
  hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor.
  hwmon: (smsc47b397) Convert to devm_hwmon_device_register_with_groups
  MAINTAINERS: add entry for the PWM fan driver
  hwmon: (k10temp) Convert to devm_hwmon_device_register_with_groups
  hwmon: (k10temp) Add support for F15h M60h
  hwmon: (da9052) Convert to devm_hwmon_device_register_with_groups
  hwmon: (da9055) Convert to devm_hwmon_device_register_with_groups
  hwmon: (ads1015) Use of_property_read_u32 at appropriate places

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
index 822dd83,9a72fdd..a2b1647
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -53,8 -53,8 +53,9 @@@ obj-$(CONFIG_LEDS_ASIC3)              += leds-asic3
  obj-$(CONFIG_LEDS_MAX8997)            += leds-max8997.o
  obj-$(CONFIG_LEDS_LM355x)             += leds-lm355x.o
  obj-$(CONFIG_LEDS_BLINKM)             += leds-blinkm.o
 +obj-$(CONFIG_LEDS_SYSCON)             += leds-syscon.o
  obj-$(CONFIG_LEDS_VERSATILE)          += leds-versatile.o
+ obj-$(CONFIG_LEDS_MENF21BMC)          += leds-menf21bmc.o
  
  # LED SPI Drivers
  obj-$(CONFIG_LEDS_DAC124S085)         += leds-dac124s085.o

diff --cc drivers/watchdog/Kconfig
Simple merge