Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Thu, 30 Dec 2010 10:26:45 +0000 (11:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 30 Dec 2010 10:26:45 +0000 (11:26 +0100)

Trivial merge