Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2009 18:32:28 +0000 (11:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2009 18:32:28 +0000 (11:32 -0700)
commit8b9f2caa02e96bb92327e3b4557adbb3f1203dc7
treef786a1bc81d1fc5636958c2c343de5f12f7616ca
parent81e4e1ba7ed4a1fdcf0e2ee944f1575010471464
parentec05a8d75d0777cd221f61a88437a31e4cfb83d8
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: (abituguru3) DMI probing for AB9, AB9 QuadQT and IX38 QuadGT
  hwmon: (sht15) Remove unnecessary semicolon
  hwmon: (max6650) Fix lock imbalance