diff options
author | 2013-09-06 13:16:01 -0700 | |
---|---|---|
committer | 2013-09-06 13:16:01 -0700 | |
commit | 1bda20da20e5c64919efcb507a84e192deed1c60 (patch) | |
tree | c0c6942fad5f73db57c02ac46dbc80657a67d772 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
parent | [IA64] Use asm-generic/bitops/builtin-ffs.h (diff) | |
download | wireguard-linux-1bda20da20e5c64919efcb507a84e192deed1c60.tar.xz wireguard-linux-1bda20da20e5c64919efcb507a84e192deed1c60.zip |
Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fixes from Tony Luck:
"Couple of small cleanups for ia64"
* tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Use asm-generic/bitops/builtin-ffs.h
[IA64] dmi.h: Make dmi_alloc use kzalloc
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions