From: Linus Torvalds Date: Thu, 19 Jul 2007 21:24:57 +0000 (-0700) Subject: Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 X-Git-Tag: v2.6.23-rc1~258 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d;p=linux-2.6-omap-h63xx.git 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 --- 40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d diff --cc MAINTAINERS index 0c83823f14c,1b1092e7469..fbe0dca1c0e --- a/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