diff options
author | 2014-05-25 10:20:36 -0700 | |
---|---|---|
committer | 2014-05-25 10:20:36 -0700 | |
commit | f016a6441a18000d5918ee3e05d9bdd4d53fed1c (patch) | |
tree | fbbbde8a52f572c15795a768897fd2f366b02317 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
parent | hwmon: (ntc_thermistor) Fix OF device ID mapping (diff) | |
download | wireguard-linux-f016a6441a18000d5918ee3e05d9bdd4d53fed1c.tar.xz wireguard-linux-f016a6441a18000d5918ee3e05d9bdd4d53fed1c.zip |
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
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions