diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:21:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:21:32 -0700 |
commit | 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 (patch) | |
tree | 9f00eee8fbeec58c0a5ee6c9ebb8906e8a832670 /arch/sparc/lib/locks.S | |
parent | fd9908c078b30db393e9855fb96f804793af23ba (diff) | |
parent | 93dae5b70e7c1c8e927d22e1c20a941ca376906a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add global register dumping facility.
sparc: remove CVS keywords
sparc64: remove CVS keywords
Diffstat (limited to 'arch/sparc/lib/locks.S')
-rw-r--r-- | arch/sparc/lib/locks.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index b1df55cb2215..64f53f2b673d 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S @@ -1,4 +1,4 @@ -/* $Id: locks.S,v 1.16 2000/02/26 11:02:47 anton Exp $ +/* * locks.S: SMP low-level lock primitives on Sparc. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |