• Linus Torvalds's avatar
    Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 · 40b42f1e
    Linus Torvalds authored
    * '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