Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:25:42 +0000 (13:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:25:42 +0000 (13:25 +0100)

Trivial merge