diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-04-12 09:42:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-12 09:42:34 +0200 |
| commit | ef389b734691cdc8beb009dd402135dcdcb86a56 (patch) | |
| tree | 9523a37db93cb7c7874a5f18b4d9a7014898b814 /arch/score/include/asm/ftrace.h | |
| parent | a774635db5c430cbf21fa5d2f2df3d23aaa8e782 (diff) | |
| parent | c76fc98260751e71c884dc1a18a07e427ef033b5 (diff) | |
Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/score/include/asm/ftrace.h')
| -rw-r--r-- | arch/score/include/asm/ftrace.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/score/include/asm/ftrace.h b/arch/score/include/asm/ftrace.h deleted file mode 100644 index 79d6f10e1f5b..000000000000 --- a/arch/score/include/asm/ftrace.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_SCORE_FTRACE_H -#define _ASM_SCORE_FTRACE_H - -#endif /* _ASM_SCORE_FTRACE_H */ |