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)
commitd351c8db95953b1b673de3966cb39640dc6c2f5f
treea080910d3ced94780e5d16401f7aab4e3d777c8d
parent1c511f740fe7031867f51831854360e8be1ba34c
parent45141d4667d208421ca787a3301542b6a5e0b112
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/ring_buffer.c