Merge branch 'tip/perf/core' 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-01 19:11:42 +02:00
commit ac0a3260f3
2 changed files with 141 additions and 214 deletions