summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/trampoline.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 13:20:57 +0400
committerIngo Molnar <mingo@elte.hu>2008-06-16 13:20:57 +0400
commitfd2c17e1777d46cff14c25ea774a4d17459d188a (patch)
treee8299216de8e99418195ba64bcf8f679df3a66b3 /arch/sparc/kernel/trampoline.S
parent74e411cb6443d8bcb55fbe89fcc7a9ee574df91b (diff)
parent066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff)
downloadlinux-fd2c17e1777d46cff14c25ea774a4d17459d188a.tar.xz
Merge branch 'linus' into x86/timers
Diffstat (limited to 'arch/sparc/kernel/trampoline.S')
-rw-r--r--arch/sparc/kernel/trampoline.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S
index 2dcdaa1fd8cd..356c56aebc62 100644
--- a/arch/sparc/kernel/trampoline.S
+++ b/arch/sparc/kernel/trampoline.S
@@ -1,4 +1,4 @@
-/* $Id: trampoline.S,v 1.14 2002/01/11 08:45:38 davem Exp $
+/*
* trampoline.S: SMP cpu boot-up trampoline code.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)