Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

This commit is contained in:
Ingo Molnar 2012-04-25 12:33:24 +02:00
commit c716ef56f1
3 changed files with 12 additions and 5 deletions