diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-13 22:02:16 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-13 22:02:22 (GMT) |
commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
tree | 55084d3d51708f90f27d0a70db5ab63916942f14 /arch/frv/include/asm/ftrace.h | |
parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
download | linux-b5c851a88a369854c04e511cefb84ea2d0cfa209.tar.xz |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/frv/include/asm/ftrace.h')
-rw-r--r-- | arch/frv/include/asm/ftrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/include/asm/ftrace.h b/arch/frv/include/asm/ftrace.h new file mode 100644 index 0000000..40a8c17 --- /dev/null +++ b/arch/frv/include/asm/ftrace.h @@ -0,0 +1 @@ +/* empty */ |