diff options
author | 2012-04-27 19:50:56 -0700 | |
---|---|---|
committer | 2012-04-27 19:50:56 -0700 | |
commit | 9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44 (patch) | |
tree | fe0b16b755eca36435be7932ea9a922df4c87973 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | hwmon: (fam15h_power) Fix pci_device_id array (diff) | |
download | wireguard-linux-9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44.tar.xz wireguard-linux-9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44.zip |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon patches from Guenter Roeck:
- Fix build warning in ad7314 driver
- Fix pci_device_id array access in fam15h_power driver, introduced by
commit 00250ec90963 ("hwmon: fam15h_power: fix bogus values with
current BIOSes")
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (fam15h_power) Fix pci_device_id array
hwmon: (ad7314) Fix build warning
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions