Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 7 Jan 2010 09:26:22 +0000 (10:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 Jan 2010 09:26:22 +0000 (10:26 +0100)

Trivial merge