Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:11:42 +0000 (19:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:11:42 +0000 (19:11 +0200)
1  2 
kernel/trace/ftrace.c

Simple merge