diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:21:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:21:32 -0400 |
| commit | 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 (patch) | |
| tree | 9f00eee8fbeec58c0a5ee6c9ebb8906e8a832670 /arch/sparc/kernel/etrap.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/kernel/etrap.S')
| -rw-r--r-- | arch/sparc/kernel/etrap.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/etrap.S b/arch/sparc/kernel/etrap.S index a8b35bed12a2..f37d961d67a6 100644 --- a/arch/sparc/kernel/etrap.S +++ b/arch/sparc/kernel/etrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: etrap.S,v 1.31 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
| 2 | * etrap.S: Sparc trap window preparation for entry into the | 2 | * etrap.S: Sparc trap window preparation for entry into the |
| 3 | * Linux kernel. | 3 | * Linux kernel. |
| 4 | * | 4 | * |