From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Feb 2008 03:15:38 +0000 (-0800)
Subject: Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
X-Git-Tag: v2.6.25-rc1~281
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d7511ec8115487ccea2ce93bf58d5e5cd2c1c0a3;p=~shefty%2Frdma-dev.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: (59 commits)
  hwmon: (lm80) Add individual alarm files
  hwmon: (lm80) De-macro the sysfs callbacks
  hwmon: (lm80) Various cleanups
  hwmon: (w83627hf) Refactor beep enable handling
  hwmon: (w83627hf) Add individual alarm and beep files
  hwmon: (w83627hf) Enable VBAT monitoring
  hwmon: (w83627ehf) The W83627DHG has 8 VID pins
  hwmon: (asb100) Add individual alarm files
  hwmon: (asb100) De-macro the sysfs callbacks
  hwmon: (asb100) Various cleanups
  hwmon: VRM is not written to registers
  hwmon: (dme1737) fix Super-IO device ID override
  hwmon: (dme1737) fix divide-by-0
  hwmon: (abituguru3) Add AUX4 fan input for Abit IP35 Pro
  hwmon: Add support for Texas Instruments/Burr-Brown ADS7828
  hwmon: (adm9240) Add individual alarm files
  hwmon: (lm77) Add individual alarm files
  hwmon: Discard useless I2C driver IDs
  hwmon: (lm85) Make the pwmN_enable files writable
  hwmon: (lm85) Return standard values in pwmN_enable
  ...
---

d7511ec8115487ccea2ce93bf58d5e5cd2c1c0a3