Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Tue, 26 Oct 2010 11:14:02 +0000 (13:14 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 26 Oct 2010 11:14:02 +0000 (13:14 +0200)
1  2 
kernel/trace/ring_buffer.c

Simple merge