ee 54f85f9314716275e46882c47cfe75541371bc22
parent 9283dfed51b223eddf68bdf91c5cddc4a9abbdbe
parent 5e5cddbc3f2936c9fefbae64633c522e242c350d
author Linus Torvalds <torvalds@linux-foundation.org> 1223580234 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223580234 -0700

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: (abituguru3) Enable DMI probing feature on Abit AT8 32X
  hwmon: (abituguru3) Enable reading from AUX3 fan on Abit AT8 32X
  hwmon: (adt7473) Fix some bogosity in documentation file
  hwmon: Define sysfs interface for energy consumption register
  hwmon: (it87) Prevent power-off on Shuttle SN68PT
  eeepc-laptop: Fix hwmon interface
0u