Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Sat, 16 Oct 2010 18:17:25 +0000 (20:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 16 Oct 2010 18:17:25 +0000 (20:17 +0200)

Trivial merge