Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)

Trivial merge