diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /arch/um/sys-ia64 | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/um/sys-ia64')
| -rw-r--r-- | arch/um/sys-ia64/sysdep/ptrace.h | 10 | ||||
| -rw-r--r-- | arch/um/sys-ia64/sysdep/sigcontext.h | 10 | ||||
| -rw-r--r-- | arch/um/sys-ia64/sysdep/syscalls.h | 10 |
3 files changed, 0 insertions, 30 deletions
diff --git a/arch/um/sys-ia64/sysdep/ptrace.h b/arch/um/sys-ia64/sysdep/ptrace.h index 42dd8fb6f2f9..0f0f4e6fd334 100644 --- a/arch/um/sys-ia64/sysdep/ptrace.h +++ b/arch/um/sys-ia64/sysdep/ptrace.h | |||
| @@ -14,13 +14,3 @@ struct sys_pt_regs { | |||
| 14 | 14 | ||
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | /* | ||
| 18 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
| 19 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 20 | * adjust the settings for this buffer only. This must remain at the end | ||
| 21 | * of the file. | ||
| 22 | * --------------------------------------------------------------------------- | ||
| 23 | * Local variables: | ||
| 24 | * c-file-style: "linux" | ||
| 25 | * End: | ||
| 26 | */ | ||
diff --git a/arch/um/sys-ia64/sysdep/sigcontext.h b/arch/um/sys-ia64/sysdep/sigcontext.h index f15fb25260ba..76b43161e779 100644 --- a/arch/um/sys-ia64/sysdep/sigcontext.h +++ b/arch/um/sys-ia64/sysdep/sigcontext.h | |||
| @@ -8,13 +8,3 @@ | |||
| 8 | 8 | ||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | /* | ||
| 12 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
| 13 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 14 | * adjust the settings for this buffer only. This must remain at the end | ||
| 15 | * of the file. | ||
| 16 | * --------------------------------------------------------------------------- | ||
| 17 | * Local variables: | ||
| 18 | * c-file-style: "linux" | ||
| 19 | * End: | ||
| 20 | */ | ||
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 @@ | |||
| 8 | 8 | ||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | /* | ||
| 12 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
| 13 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 14 | * adjust the settings for this buffer only. This must remain at the end | ||
| 15 | * of the file. | ||
| 16 | * --------------------------------------------------------------------------- | ||
| 17 | * Local variables: | ||
| 18 | * c-file-style: "linux" | ||
| 19 | * End: | ||
| 20 | */ | ||