Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:11:37 +0000 (10:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:11:37 +0000 (10:11 +0100)
commitd06bbd669539215405874d8fe32ab65105e6c4bb
tree2567b00257b633fa13220fa515d4bad9749405db
parentd844222a54c33a960755b44b934cd1b01b05dceb
parent3e89c7bb92fc92bb964734341487798c8d497bae
parentc1e7abbc7afc97367cd77c8f2895c2169a8f9c87
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
kernel/trace/ring_buffer.c
arch/x86/Kconfig
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c