Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:44:43 +0000 (08:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:44:43 +0000 (08:44 -0700)
commit10a0d912898ac2fe49094acf2c1339d0fb4c2bc6
treeca87b31c5b958599b313e40cc141748664687c51
parent51dcdfec6a274afc1c6fce180d582add9ff512c0
parent2c03d07ad54db03b813bb98c469790c07ca9f5dd
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
drivers/hwmon/Kconfig
drivers/hwmon/Makefile