Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Mon, 4 Jul 2011 10:27:28 +0000 (12:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 4 Jul 2011 10:27:28 +0000 (12:27 +0200)

Trivial merge