summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/rtrap.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-29 18:05:05 +0400
committerIngo Molnar <mingo@elte.hu>2008-05-29 18:05:05 +0400
commit6715930654e06c4d2e66e718ea159079f71838f4 (patch)
tree6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /arch/sparc/kernel/rtrap.S
parentea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff)
parente490517a039a99d692cb3a5561941b0a5f576172 (diff)
downloadlinux-6715930654e06c4d2e66e718ea159079f71838f4.tar.xz
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'arch/sparc/kernel/rtrap.S')
-rw-r--r--arch/sparc/kernel/rtrap.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S
index ab818cdc4cc0..ce30082ab266 100644
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.58 2002/01/31 03:30:05 davem Exp $
+/*
* rtrap.S: Return from Sparc trap low-level code.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)