Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Dec 2009 16:12:37 +0000 (17:12 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Dec 2009 16:12:37 +0000 (17:12 +0100)
commit0087aabd6a3744c28114240776918f5d15e46b98
tree8bf3ba7b3395490441722360d2872480f64cd694
parentcc0104e877fff32865a67b256d3a9ce52ff15790
parentcc51a0fca66658ea710db566ba17e80e3f7d4957
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
kernel/trace/trace.c