Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
1  2 
kernel/trace/trace.c

Simple merge