tree f786a1bc81d1fc5636958c2c343de5f12f7616ca
parent 81e4e1ba7ed4a1fdcf0e2ee944f1575010471464
parent ec05a8d75d0777cd221f61a88437a31e4cfb83d8
author Linus Torvalds <torvalds@linux-foundation.org> 1247337148 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247337148 -0700

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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