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/vt1211: Add probing of alternate config index port
  hwmon/f71805f: Fix a race condition
  hwmon/abituguru: Fix unchecked return status
  hwmon: New driver for the Analog Devices ADM1029
  hwmon/w83627ehf: Add support for the W83627DHG chip
  hwmon: Use subsys_initcall
  hwmon/lm70: Make lm70_remove a __devexit function
  hwmon: Cleanup a bogus legacy comment
  hwmon: Simplify the locking model of two drivers
  hwmon: Drop unused mutexes in two drivers
  hwmon/it87: Add PWM base frequency control

diff --combined MAINTAINERS
index 270c6b0,0556a8d..6261597
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -247,13 -247,6 +247,13 @@@ L:       linux-acpi@vger.kernel.or
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
 +ACPI VIDEO DRIVER
 +P:    Luming Yu
 +M:    luming.yu@intel.com
 +L:    linux-acpi@vger.kernel.org
 +W:    http://acpi.sourceforge.net/
 +S:    Supported
 +
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
  M:    Thorsten Knabe <linux@thorsten-knabe.de>
@@@ -275,6 -268,12 +275,12 @@@ M:       khali@linux-fr.or
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  
+ ADM1029 HARDWARE MONITOR DRIVER
+ P:    Corentin Labbe
+ M:    corentin.labbe@geomatys.fr
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ 
  ADT746X FAN DRIVER
  P:    Colin Leroy
  M:    colin@colino.net
@@@ -627,11 -626,6 +633,11 @@@ P:       Haavard Skinnemoe
  M:    hskinnemoen@atmel.com
  S:    Supported
  
 +ATMEL SPI DRIVER
 +P:    Haavard Skinnemoen
 +M:    hskinnemoen@atmel.com
 +S:    Supported
 +
  ATMEL WIRELESS DRIVER
  P:    Simon Kelley
  M:    simon@thekelleys.org.uk
@@@ -2630,8 -2624,8 +2636,8 @@@ T:      git kernel.org:/pub/scm/linux/kernel
  S:    Maintained
  
  PCNET32 NETWORK DRIVER
 -P:    Thomas Bogendörfer
 -M:    tsbogend@alpha.franken.de
 +P:    Don Fry
 +M:    pcnet32@verizon.net
  L:    netdev@vger.kernel.org
  S:    Maintained
  
@@@ -3068,8 -3062,6 +3074,8 @@@ S:      Maintaine
  SONY VAIO CONTROL DEVICE DRIVER
  P:    Stelian Pop
  M:    stelian@popies.net
 +P:    Mattia Dongili
 +M:    malattia@linux.it
  W:    http://popies.net/sonypi/
  S:    Maintained
  
@@@ -3788,7 -3780,6 +3794,7 @@@ P:      Andi Klee
  M:    ak@suse.de
  L:    discuss@x86-64.org
  W:    http://www.x86-64.org
 +T:    quilt ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt-current
  S:    Maintained
  
  YAM DRIVER FOR AX.25