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

This commit is contained in:
Ingo Molnar 2011-05-18 19:46:10 +02:00
commit af2d03d4aa
9 changed files with 274 additions and 106 deletions