Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Sun, 9 Jan 2011 09:42:21 +0000 (10:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 9 Jan 2011 09:42:21 +0000 (10:42 +0100)

Trivial merge