Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000 (12:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000 (12:15 +0200)
1  2 
kernel/trace/trace.c

Simple merge