aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/boot/piggyback.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-23 02:53:23 -0400
committerPaul Mackerras <paulus@samba.org>2008-05-23 02:53:23 -0400
commitacf464817d5e7be9fb67aec4027dbee0ac9be17a (patch)
tree39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /arch/sparc/boot/piggyback.c
parent80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff)
parent8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff)
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'arch/sparc/boot/piggyback.c')
-rw-r--r--arch/sparc/boot/piggyback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c
index 6962cc68ed5b..c9f500c1a8b2 100644
--- a/arch/sparc/boot/piggyback.c
+++ b/arch/sparc/boot/piggyback.c
@@ -1,4 +1,4 @@
1/* $Id: piggyback.c,v 1.4 2000/12/05 00:48:57 anton Exp $ 1/*
2 Simple utility to make a single-image install kernel with initial ramdisk 2 Simple utility to make a single-image install kernel with initial ramdisk
3 for Sparc tftpbooting without need to set up nfs. 3 for Sparc tftpbooting without need to set up nfs.
4 4