summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/sbus.c
diff options
context:
space:
mode:
authorIngo Molnar2008-06-16 11:23:36 +0200
committerIngo Molnar2008-06-16 11:23:36 +0200
commit766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch)
treef6f2df0e35bbea914d1f4d12be6d02f128c73575 /arch/sparc64/kernel/sbus.c
parentrcu: remove unused field struct rcu_data::rcu_tasklet (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadkernel-qcow2-linux-766d02786ecd22932beeb9ca8bad6d8c5a552ef9.tar.gz
kernel-qcow2-linux-766d02786ecd22932beeb9ca8bad6d8c5a552ef9.tar.xz
kernel-qcow2-linux-766d02786ecd22932beeb9ca8bad6d8c5a552ef9.zip
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/sparc64/kernel/sbus.c')
-rw-r--r--arch/sparc64/kernel/sbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index fa2827c4a3ad..e33a8a660e9e 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1,4 +1,4 @@
-/* $Id: sbus.c,v 1.19 2002/01/23 11:27:32 davem Exp $
+/*
* sbus.c: UltraSparc SBUS controller support.
*
* Copyright (C) 1999 David S. Miller (davem@redhat.com)