diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 10:14:15 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 10:14:15 +0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /arch/um/sys-ia64/sysdep/syscalls.h | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
| download | linux-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.xz | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 4a1f46ef1ebc..5f6700c41558 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: - */ |