Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus...
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Feb 2009 19:45:41 +0000 (20:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Feb 2009 19:45:41 +0000 (20:45 +0100)

Trivial merge