Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function-return...
authorIngo Molnar <mingo@elte.hu>
Thu, 13 Nov 2008 08:48:03 +0000 (09:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 13 Nov 2008 08:48:03 +0000 (09:48 +0100)
commit24de38620dd3504782c90c0892eef888d0c351e9
tree6de8d1a9785fc4b38287f8f3509015fdcbbaedff
parent94b80ffd650b22e1fd493ccf6bad7efda4b8ea85
parent68f96c0c889b55bf62eee98e859cb686f8850188
parent1dc1c6adf38bc5799d1594681645ced40ced4b6b
parent47e74f2ba8fbf9fb1378e2524e6cfdc2fb37f160
Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function-return-tracer' and 'tracing/urgent' into tracing/core
kernel/trace/ring_buffer.c