diff options
author | 2010-12-14 13:36:26 -0800 | |
---|---|---|
committer | 2010-12-14 13:36:26 -0800 | |
commit | dc99bf78238a7554578a319d8fd06655151121a3 (patch) | |
tree | 206150fd9ad2669c8f62a05d32fa3679949da65c /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx (diff) | |
parent | hwmon: (ltc4215) make sysfs file match the alarm cause (diff) | |
download | linux-dev-dc99bf78238a7554578a319d8fd06655151121a3.tar.xz linux-dev-dc99bf78238a7554578a319d8fd06655151121a3.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (ltc4215) make sysfs file match the alarm cause
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions