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

Pull hwmon changes for v3.4 from Guenter Roeck:
 "Mostly cleanup.  No new drivers this time around, but support for
  several chips added to existing drivers: TPS40400, TPS40422, MTD040,
  MAX34446, ZL9101M, ZL9117M, and LM96080.  Also, added watchdog support
  for SCH56xx, and additional attributes for a couple of drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (137 commits)
  hwmon: (sch56xx) Add support for the integrated watchdog (v2)
  hwmon: (w83627ehf) Add support for temperature offset registers
  hwmon: (jc42) Remove unnecessary device IDs
  hwmon: (zl6100) Add support for ZL9101M and ZL9117M
  hwmon: (adm1275) Add support for ADM1075
  hwmon: (max34440) Add support for MAX34446
  hwmon: (pmbus) Add more virtual registers
  hwmon: (pmbus) Add support for Lineage Power MDT040
  hwmon: (pmbus) Add support for TI TPS40400 and TPS40422
  hwmon: (max34440) Add support for 'lowest' output voltage attribute
  hwmon: (jc42) Convert to use devm_kzalloc
  hwmon: (max16065) Convert to use devm_kzalloc
  hwmon: (smm665) Convert to use devm_kzalloc
  hwmon: (ltc4261) Convert to use devm_kzalloc
  hwmon: (pmbus) Simplify remove functions
  hwmon: (pmbus) Convert pmbus drivers to use devm_kzalloc
  hwmon: (lineage-pem) Convert to use devm_kzalloc
  hwmon: (hwmon-vid) Fix checkpatch issues
  hwmon: (hwmon-vid) Add new entries to VRM model table
  hwmon: (lm80) Add detection of NatSemi/TI LM96080
  ...

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index dad895fec62a..811e6c47e7e6 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -598,11 +598,11 @@ config SENSORS_LM78
           will be called lm78.
 
 config SENSORS_LM80
-        tristate "National Semiconductor LM80"
+        tristate "National Semiconductor LM80 and LM96080"
         depends on I2C
         help
           If you say yes here you get support for National Semiconductor
-          LM80 sensor chips.
+          LM80 and LM96080 sensor chips.
 
           This driver can also be built as a module.  If so, the module
           will be called lm80.
@@ -1028,7 +1028,8 @@ config SENSORS_SCH5627
         select SENSORS_SCH56XX_COMMON
         help
           If you say yes here you get support for the hardware monitoring
-          features of the SMSC SCH5627 Super-I/O chip.
+          features of the SMSC SCH5627 Super-I/O chip including support for
+          the integrated watchdog.
 
           This driver can also be built as a module.  If so, the module
           will be called sch5627.
@@ -1044,7 +1045,8 @@ config SENSORS_SCH5636
 
           Currently this driver only supports the Fujitsu Theseus SCH5636 based
           hwmon solution. Say yes here if you want support for the Fujitsu
-          Theseus' hardware monitoring features.
+          Theseus' hardware monitoring features including support for the
+          integrated watchdog.
 
           This driver can also be built as a module.  If so, the module
           will be called sch5636.