From: Linus Torvalds Date: Sun, 21 Sep 2008 19:41:19 +0000 (-0700) Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d541b22abde3e71af4b65d79a510b6bc551d5f76;p=linux-beck.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: (ad7414) Make ad7414_update_device() static hwmon: (it87) Fix fan tachometer reading in IT8712F rev 0x7 (I) hwmon: (atxp1) Fix device detection logic --- d541b22abde3e71af4b65d79a510b6bc551d5f76