diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:34:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:34:42 +0200 |
| commit | 2e8844e13ab73f1107aea4317a53ff5879f2e1d7 (patch) | |
| tree | 36165371cf6fd26d674610f1c6bb5fac50e6e13f /arch/um/sys-ia64/sysdep/syscalls.h | |
| parent | c78a3956b982418186e40978a51636a2b43221bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into tracing/hw-branch-tracing
Merge reason: update to latest tracing and ptrace APIs
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um/sys-ia64/sysdep/syscalls.h')
| -rw-r--r-- | arch/um/sys-ia64/sysdep/syscalls.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/um/sys-ia64/sysdep/syscalls.h b/arch/um/sys-ia64/sysdep/syscalls.h index 4a1f46ef1eb..5f6700c4155 100644 --- a/arch/um/sys-ia64/sysdep/syscalls.h +++ b/arch/um/sys-ia64/sysdep/syscalls.h @@ -8,13 +8,3 @@ #endif -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |