From: Linus Torvalds Date: Tue, 7 Apr 2009 15:44:43 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10a0d912898ac2fe49094acf2c1339d0fb4c2bc6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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: Add Asus ATK0110 support hwmon: (lm95241) Convert to new-style i2c driver --- 10a0d912898ac2fe49094acf2c1339d0fb4c2bc6