From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 May 2014 17:20:36 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f016a6441a18000d5918ee3e05d9bdd4d53fed1c;p=linux.git

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull hwmon subsystem fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (ntc_thermistor) Fix OF device ID mapping
  hwmon: (ntc_thermistor) Fix dependencies
  hwmon: Document temp[1-*]_min_hyst sysfs attribute
---

f016a6441a18000d5918ee3e05d9bdd4d53fed1c