]> git.baikalelectronics.ru Git - 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)
commit5cc97309e228e2c4711953de49bad4773090ddc0
tree49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253
parentfd8b2b4874011274eee586d0b59c59887abc6a0e
parent66d21fb51c21f633f236f25d9a3cda4d7ff9b5a2
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