aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/scripting-engines/trace-event-python.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-23 15:39:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-23 15:39:40 -0800
commit79534f237f05cac7f728cc957efdcc17603e38cd (patch)
tree1eb7456d8ffa9f0adcd5ef9b7d239de4f8df4a47 /tools/perf/util/scripting-engines/trace-event-python.c
parentKEYS: Don't call up_write() if __key_link_begin() returns an error (diff)
parentMerge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent (diff)
parentx86, kexec: Limit the crashkernel address appropriately (diff)
downloadlinux-dev-79534f237f05cac7f728cc957efdcc17603e38cd.tar.xz
linux-dev-79534f237f05cac7f728cc957efdcc17603e38cd.zip
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf probe: Fix to support libdwfl older than 0.148 perf tools: Fix lazy wildcard matching perf buildid-list: Fix error return for success perf buildid-cache: Fix symbolic link handling perf symbols: Stop using vmlinux files with no symbols perf probe: Fix use of kernel image path given by 'k' option * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, kexec: Limit the crashkernel address appropriately