diff options
author | 2010-12-26 17:05:07 -0500 | |
---|---|---|
committer | 2010-12-26 17:05:07 -0500 | |
commit | bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad (patch) | |
tree | aa085801b7b1203c171c7f999d0a26a4105ba4ec /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | ACPI / ACPICA: Disable GPEs during initialization (diff) | |
parent | Revert "ACPI battery: update status upon sysfs query" (diff) | |
download | wireguard-linux-bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad.tar.xz wireguard-linux-bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad.zip |
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release