Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Thu, 4 Mar 2010 10:51:29 +0000 (11:51 +0100)]

Trivial merge