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: (41 commits)
  hwmon: (adt7475) Add VID support for the ADT7476
  hwmon: (adt7475) Add an entry in MAINTAINERS
  hwmon: (adt7475) Add support for the ADT7476
  hwmon: (adt7475) Voltage attenuators can be bypassed
  hwmon: (adt7475) Print device information on probe
  hwmon: (adt7475) Handle alternative pin functions
  hwmon: (adt7475) Move sysfs files removal to a separate function
  hwmon: (adt7475) Add support for the ADT7490
  hwmon: (adt7475) Improve device detection
  hwmon: (adt7475) Add missing static marker
  hwmon: (adt7475) Rework voltage inputs handling
  hwmon: (adt7475) Implement pwm_use_point2_pwm_at_crit
  hwmon: (adt7475) New documentation
  hwmon: (adt7475) Add support for the ADT7473
  hwmon: (f71882fg) Add support for the f71889fg (version 2)
  hwmon: (f71882fg) Fix sysfs file removal
  hwmon: (f71882fg) Cleanup sysfs attr creation 2/2
  hwmon: (f71882fg) Cleanup sysfs attr creation 1/2
  hwmon: (thmc50) Stop using I2C_CLIENT_MODULE_PARM
  hwmon: Add Freescale MC13783 ADC driver
  ...

1 files changed, 15 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 107a5a5a0174..746b706206da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -327,6 +327,13 @@ M:	Colin Leroy <colin@colino.net>
 S:      Maintained
 F:      drivers/macintosh/therm_adt746x.c
 
+ADT7475 HARDWARE MONITOR DRIVER
+M:      Jean Delvare <khali@linux-fr.org>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/adt7475
+F:      drivers/hwmon/adt7475.c
+
 ADVANSYS SCSI DRIVER
 M:      Matthew Wilcox <matthew@wil.cx>
 L:      linux-scsi@vger.kernel.org
@@ -2416,7 +2423,9 @@ HARDWARE MONITORING
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
 S:      Orphan
+F:      Documentation/hwmon/
 F:      drivers/hwmon/
+F:      include/linux/hwmon*.h
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:      Matt Mackall <mpm@selenic.com>
@@ -3312,6 +3321,12 @@ S:	Maintained
 F:      Documentation/hwmon/lis3lv02d
 F:      drivers/hwmon/lis3lv02d.*
 
+LM73 HARDWARE MONITOR DRIVER
+M:      Guillaume Ligneul <guillaume.ligneul@gmail.com>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      drivers/hwmon/lm73.c
+
 LM83 HARDWARE MONITOR DRIVER
 M:      Jean Delvare <khali@linux-fr.org>
 L:      lm-sensors@lm-sensors.org