Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:57:03 +0000 (08:57 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:57:03 +0000 (08:57 -0800)
commit79d26287021d3158e3cb8da820f1b8233564dd3b
tree484d82e528c2e7326b26b3ed8910babe2b892595
parentc8fefb1bb4b38607d305c7e9ef55f146c9c628cb
parentc70a8c345fd770ecb2ff334bdf88b63edaffb77d
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/w83793: Hide invalid VID readings
  hwmon/w83793: Fix the fan input detection
  hwmon/w83793: Ignore disabled temperature channels
  hwmon: Fix the VRD 11 decoding
  hwmon/w83793: Remove the description of AMDSI and update the voltage formula