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-ppc/sigcontext.c | |
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-ppc/sigcontext.c')
-rw-r--r-- | arch/um/sys-ppc/sigcontext.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/um/sys-ppc/sigcontext.c b/arch/um/sys-ppc/sigcontext.c index 4bdc15c89ed..40694d0f3d1 100644 --- a/arch/um/sys-ppc/sigcontext.c +++ b/arch/um/sys-ppc/sigcontext.c | |||
@@ -2,13 +2,3 @@ | |||
2 | #include "asm/sigcontext.h" | 2 | #include "asm/sigcontext.h" |
3 | #include "sysdep/ptrace.h" | 3 | #include "sysdep/ptrace.h" |
4 | 4 | ||
5 | /* | ||
6 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
7 | * Emacs will notice this stuff at the end of the file and automatically | ||
8 | * adjust the settings for this buffer only. This must remain at the end | ||
9 | * of the file. | ||
10 | * --------------------------------------------------------------------------- | ||
11 | * Local variables: | ||
12 | * c-file-style: "linux" | ||
13 | * End: | ||
14 | */ | ||