tree ca87b31c5b958599b313e40cc141748664687c51
parent 51dcdfec6a274afc1c6fce180d582add9ff512c0
parent 2c03d07ad54db03b813bb98c469790c07ca9f5dd
author Linus Torvalds <torvalds@linux-foundation.org> 1239119083 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239119083 -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: Add Asus ATK0110 support
  hwmon: (lm95241) Convert to new-style i2c driver