Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linus' into...
authorIngo Molnar <mingo@elte.hu>
Fri, 20 Mar 2009 09:14:53 +0000 (10:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 Mar 2009 09:14:53 +0000 (10:14 +0100)

Trivial merge