Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Wed, 8 Jun 2011 13:49:03 +0000 (15:49 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 8 Jun 2011 13:49:03 +0000 (15:49 +0200)

Trivial merge