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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
index 0c83823f14c3390ef2eeafd1dd275afc0880da5a,1b1092e746950a8c0383d06e606fb245dcefadb7..fbe0dca1c0ed9d13974e20cea2bb4a800c662551
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1267,12 -1283,12 +1273,18 @@@ M:   tori@unhappy.mine.n
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +DMA GENERIC MEMCPY SUBSYSTEM
 +P:    Shannon Nelson
 +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

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Makefile
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc include/linux/i2c.h
Simple merge