]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branches 'tracing/fastboot', 'tracing/ftrace' and 'tracing/urgent' into tracing...
authorIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:28:46 +0000 (07:28 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:28:46 +0000 (07:28 +0100)
1  2  3 
kernel/trace/ring_buffer.c

Simple merge