Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 09:26:45 +0000 (10:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 09:26:45 +0000 (10:26 +0100)
1  2 
kernel/trace/ring_buffer.c

Simple merge