Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: Add MAINTAINERS entry for new ams driver
  hwmon: New AMS hardware monitoring driver
  hwmon/w83793: Add documentation and maintainer
  hwmon: New Winbond W83793 hardware monitoring driver
  hwmon: Update Rudolf Marek's e-mail address
  hwmon/f71805f: Fix the device address decoding
  hwmon/f71805f: Always create all fan inputs
  hwmon/f71805f: Add support for the Fintek F71872F/FG chip
  hwmon: New PC87427 hardware monitoring driver
  hwmon/it87: Remove the SMBus interface support
  hwmon/hdaps: Update the list of supported devices
  hwmon/hdaps: Move the DMI detection data to .data
  hwmon/pc87360: Autodetect the VRM version
  hwmon/f71805f: Document the fan control features
  hwmon/f71805f: Add support for "speed mode" fan speed control
  hwmon/f71805f: Support DC fan speed control mode
  hwmon/f71805f: Let the user adjust the PWM base frequency
  hwmon/f71805f: Add manual fan speed control
  hwmon/f71805f: Store the fan control registers

1 files changed, 14 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 38df7256d287..dea5b2a6de0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -277,7 +277,7 @@ S:	Maintained
 
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
-M:      r.marek@sh.cvut.cz
+M:      r.marek@assembler.cz
 L:      i2c@lm-sensors.org
 S:      Maintained
 
@@ -296,6 +296,13 @@ L:	info-linux@geode.amd.com
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
+AMS (Apple Motion Sensor) DRIVER
+P:      Stelian Pop
+M:      stelian@popies.net
+P:      Michael Hanselmann
+M:      linux-kernel@hansmi.ch
+S:      Supported
+
 AMSO1100 RNIC DRIVER
 P:      Tom Tucker
 M:      tom@opengridcomputing.com
@@ -3436,6 +3443,12 @@ M:	bezaur@gmail.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+W83793 HARDWARE MONITORING DRIVER
+P:      Rudolf Marek
+M:      r.marek@assembler.cz
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 P:      Pierre Ossman
 M:      drzeus-wbsd@drzeus.cx