Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 May 2011 17:46:10 +0000 (19:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 May 2011 17:46:10 +0000 (19:46 +0200)

Trivial merge