Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Mon, 10 May 2010 11:13:40 +0000 (13:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 10 May 2010 11:13:40 +0000 (13:13 +0200)

Trivial merge