Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:21:24 +0000 (11:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:21:24 +0000 (11:21 +0100)
1  2 
kernel/trace/trace.c

Simple merge