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-06-20 14:26:58 +02:00
commit 6921a575c9