Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Jun 2011 14:25:34 +0000 (16:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Jun 2011 14:25:34 +0000 (16:25 +0200)

Trivial merge