Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 29 May 2007 20:44:34 +0000 (13:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 29 May 2007 20:44:34 +0000 (13:44 -0700)
commit358a9afc35d550db4f67b1c8336f5326244ceeda
treef655236e34eb0a5d527dbd972600dd76305897df
parent55663219378eecd6fccb319be27ce6737a535e4c
parent6996abf0962bb86b6285987a4698f6d275ff531f
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/applesmc: Handle name file creation error and deletion
  hwmon/applesmc: Simplify dependencies
  hwmon-vid: Don't spam the logs when VRM version is missing
  hwmon/w83627hf: Be quiet when no chip is found
  hwmon/coretemp: Add more safety checks
  hwmon/ds1621: Fix swapped temperature limits