Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (44 commits)
  i2c: Delete the i2c-isa pseudo bus driver
  hwmon: refuse to load abituguru driver on non-Abit boards
  hwmon: fix Abit Uguru3 driver detection on some motherboards
  hwmon/w83627ehf: Be quiet when no chip is found
  hwmon/w83627ehf: No need to initialize fan_min
  hwmon/w83627ehf: Export the thermal sensor types
  hwmon/w83627ehf: Enable VBAT monitoring
  hwmon/w83627ehf: Add support for the VID inputs
  hwmon/w83627ehf: Fix timing issues
  hwmon/w83627ehf: Add error messages for two error cases
  hwmon/w83627ehf: Convert to a platform driver
  hwmon/w83627ehf: Update the Kconfig entry
  make coretemp_device_remove() static
  hwmon: Add LM93 support
  hwmon: Improve the pwmN_enable documentation
  hwmon/smsc47b397: Don't report missing fans as spinning at 82 RPM
  hwmon: Add support for newer uGuru's
  hwmon/f71805f: Add temperature-tracking fan control mode
  hwmon/w83627ehf: Preserve speed reading when changing fan min
  hwmon: fix detection of abituguru volt inputs
  ...

Manual fixup of trivial conflict in MAINTAINERS file

1 files changed, 33 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0c83823f14c3..fbe0dca1c0ed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -607,6 +607,12 @@ W:	http://sourceforge.net/projects/acpi4asus
 W:      http://xf.iksaif.net/acpi4asus
 S:      Maintained
 
+ASUS ASB100 HARDWARE MONITOR DRIVER
+P:      Mark M. Hoffman
+M:      mhoffman@lightlink.com
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 ASUS LAPTOP EXTRAS DRIVER
 P:      Corentin Chary
 M:      corentincj@iksaif.net
@@ -1273,6 +1279,12 @@ M:	shannon.nelson@intel.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+DME1737 HARDWARE MONITOR DRIVER
+P:      Juerg Haefliger
+M:      juergh@gmail.com
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 DOCBOOK FOR DOCUMENTATION
 P:      Randy Dunlap
 M:      rdunlap@xenotime.net
@@ -1623,11 +1635,11 @@ W:	http://gigaset307x.sourceforge.net/
 S:      Maintained
 
 HARDWARE MONITORING
-P:      Jean Delvare
-M:      khali@linux-fr.org
+P:      Mark M. Hoffman
+M:      mhoffman@lightlink.com
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
-T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/
+T:      git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git
 S:      Maintained
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
@@ -1763,6 +1775,12 @@ P:	William Irwin
 M:      wli@holomorphy.com
 S:      Maintained
 
+I2C/SMBUS STUB DRIVER
+P:      Mark M. Hoffman
+M:      mhoffman@lightlink.com
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 I2C SUBSYSTEM
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -3292,6 +3310,12 @@ W:	http://www.brownhat.org/sis900.html
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+SIS 96X I2C/SMBUS DRIVER
+P:      Mark M. Hoffman
+M:      mhoffman@lightlink.com
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 SIS FRAMEBUFFER DRIVER
 P:      Thomas Winischhofer
 M:      thomas@winischhofer.net
@@ -3309,6 +3333,12 @@ P:	Nicolas Pitre
 M:      nico@cam.org
 S:      Maintained
 
+SMSC47B397 HARDWARE MONITOR DRIVER
+P:      Mark M. Hoffman
+M:      mhoffman@lightlink.com
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 SOFTMAC LAYER (IEEE 802.11)
 P:      Johannes Berg
 M:      johannes@sipsolutions.net