Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Sep 2008 19:41:19 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Sep 2008 19:41:19 +0000 (12:41 -0700)
commitd541b22abde3e71af4b65d79a510b6bc551d5f76
tree35041bcaeb0ddac14ce323f927fda2922afc651b
parent6f21d806f698a5c437dcae1f03e8dd73e3f5aab1
parentd130d97154f5342973a0fffc0b5a144359273c79
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