Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Fri, 27 May 2011 12:08:09 +0000 (14:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 May 2011 12:08:09 +0000 (14:08 +0200)

Trivial merge