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)
commitac0a3260f37b8616da8d33488ec94b94e6ae5b31
tree0db61f7492d45f1d548b0bcef06a0df9c904442c
parent809435ff4f43a5c0cb0201b3b89176253d5ade18
parentb9df92d2a94eef8811061aecb1396290df440e2e
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/trace/ftrace.c