From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Oct 2008 19:23:54 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v3.12-rc1~18245
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07f405541892bd9bab4cca6c12499091ef4dd556;p=kernel%2Fkernel-generic.git

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
---

07f405541892bd9bab4cca6c12499091ef4dd556