summaryrefslogtreecommitdiffstats
path: root/arch/sparc/prom/misc.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
commitacf464817d5e7be9fb67aec4027dbee0ac9be17a (patch)
tree39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /arch/sparc/prom/misc.c
parent80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff)
parent8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff)
downloadtalos-obmc-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz
talos-obmc-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'arch/sparc/prom/misc.c')
-rw-r--r--arch/sparc/prom/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c
index d9fb3af41c1f..49b5057b9601 100644
--- a/arch/sparc/prom/misc.c
+++ b/arch/sparc/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.18 2000/08/26 02:38:03 anton Exp $
+/*
* misc.c: Miscellaneous prom functions that don't belong
* anywhere else.
*
OpenPOWER on IntegriCloud