diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-22 23:48:37 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-22 23:48:37 -0400 |
commit | c1e554aeea12d2dab5183e011c27dee6142dc927 (patch) | |
tree | a44908fa5c2f1f24b6f7e7313b60e49cd3235cdd /include/asm-sparc/smpprim.h | |
parent | c203e45f069af47ca7623e4dcd8c00bfba2722e4 (diff) | |
parent | 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/asm-sparc/smpprim.h')
-rw-r--r-- | include/asm-sparc/smpprim.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/smpprim.h b/include/asm-sparc/smpprim.h index e7b6d346ae10..eb849d862c64 100644 --- a/include/asm-sparc/smpprim.h +++ b/include/asm-sparc/smpprim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: smpprim.h,v 1.5 1996/08/29 09:48:49 davem Exp $ | 1 | /* |
2 | * smpprim.h: SMP locking primitives on the Sparc | 2 | * smpprim.h: SMP locking primitives on the Sparc |
3 | * | 3 | * |
4 | * God knows we won't be actually using this code for some time | 4 | * God knows we won't be actually using this code for some time |