diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 21:54:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 00:49:02 +0200 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /arch/um | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/ftrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/asm/ftrace.h b/arch/um/include/asm/ftrace.h new file mode 100644 index 00000000000..40a8c178f10 --- /dev/null +++ b/arch/um/include/asm/ftrace.h @@ -0,0 +1 @@ +/* empty */ |