Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <[email protected]>
Mon, 14 Dec 2009 16:12:37 +0000 (17:12 +0100)
committerIngo Molnar <[email protected]>
Mon, 14 Dec 2009 16:12:37 +0000 (17:12 +0100)
1  2 
kernel/trace/trace.c

Simple merge