Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing...
authorIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 09:34:23 +0000 (10:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 09:34:23 +0000 (10:34 +0100)

Trivial merge