Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sat, 20 Jun 2009 15:25:49 +0000 (17:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 20 Jun 2009 15:25:49 +0000 (17:25 +0200)

Trivial merge