Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2009 21:31:13 +0000 (14:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2009 21:31:13 +0000 (14:31 -0700)
commit7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d
tree50919af840b007509cd961870dbf59e13c2b139f
parentddb1d4ede9c8acd2e20ac99bf2b68146ae9f3553
parent8d282497cbf8124d6814d51a74fb13d69531c669
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (asus_atk0110) Fix upper limit readings
  hwmon: (smsc47m1) Differentiate between LPC47M233 and LPC47M292