]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Jul 2010 07:10:29 +0000 (09:10 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Jul 2010 07:10:29 +0000 (09:10 +0200)
commit3a01736e70a7d629140695ba46a901266b4460cc
tree49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253
parent4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb
parent24a461d537f49f9da6533d83100999ea08c6c755
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_output.c