aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-12 10:11:37 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-12 10:11:37 +0100
commitd06bbd669539215405874d8fe32ab65105e6c4bb (patch)
tree2567b00257b633fa13220fa515d4bad9749405db
parentd844222a54c33a960755b44b934cd1b01b05dceb (diff)
parent3e89c7bb92fc92bb964734341487798c8d497bae (diff)
parentc1e7abbc7afc97367cd77c8f2895c2169a8f9c87 (diff)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts: kernel/trace/ring_buffer.c