Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' into...
authorIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 13:30:57 +0000 (14:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 13:30:57 +0000 (14:30 +0100)
1  2  3 
kernel/trace/ring_buffer.c

Simple merge