| commit | f016a6441a18000d5918ee3e05d9bdd4d53fed1c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 25 10:20:36 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 25 10:20:36 2014 -0700 |
| tree | fbbbde8a52f572c15795a768897fd2f366b02317 | |
| parent | 0e37c275426c34712d4661d86c375779f3836a7e [diff] | |
| parent | ead82d6792ef5c600d535bca6ec50a4da14ff7c7 [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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