Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Thu, 9 Jun 2011 07:14:34 +0000 (09:14 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 9 Jun 2011 07:14:34 +0000 (09:14 +0200)

Trivial merge