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

This commit is contained in:
Ingo Molnar 2011-12-06 19:09:15 +01:00
commit cc991b83b3
3 changed files with 79 additions and 28 deletions