diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 14:30:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 14:30:57 +0100 |
commit | 4a66a82be78e1b6f9f83074423bf42a52251414c (patch) | |
tree | 027030444e79c5ae55feeb8410a5e73b17612d84 /arch/x86/kernel/ftrace.c | |
parent | blktrace: the ftrace interface needs CONFIG_TRACING (diff) | |
parent | kmemtrace: fix printk format warnings (diff) | |
parent | x86, ds, bts: cleanup/fix DS configuration (diff) | |
download | linux-4a66a82be78e1b6f9f83074423bf42a52251414c.tar.xz linux-4a66a82be78e1b6f9f83074423bf42a52251414c.zip |
Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' into tracing/core