Merge branches 'tracing/fastboot', 'tracing/ftrace' and 'tracing/urgent' into tracing...
authorIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:28:46 +0000 (07:28 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:28:46 +0000 (07:28 +0100)
commitc91add5fa68ea9b1f2923b3788c5dae0e60e1f6b
tree95e94cf87c9310d33afcf7139fe2a9ac78494f74
parentd1aaf8cf8afe70a8c2235a565885291fe290c57c
parentb3535c6390f27d04273e4eee0bc687f171fbf5f4
parentee51a1de7e3837577412be269e0100038068e691
Merge branches 'tracing/fastboot', 'tracing/ftrace' and 'tracing/urgent' into tracing/core
kernel/trace/ring_buffer.c