Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
Ingo Molnar [Mon, 12 Oct 2009 21:26:36 +0000 (23:26 +0200)]

Trivial merge