From a62a0f262e0179df8c632f529c95abf54ef78332 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 1 Dec 1997 17:57:09 +0000 Subject: Part #2 merging back my changes ... --- arch/sparc64/boot/piggyback.c | 2 +- arch/sparc64/kernel/sunos_ioctl32.c | 2 +- arch/sparc64/kernel/sys_sunos32.c | 2 +- arch/sparc64/kernel/trampoline.S | 2 +- arch/sparc64/lib/VIS.h | 2 +- arch/sparc64/mm/modutil.c | 2 +- arch/sparc64/mm/ultra.S | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'arch/sparc64') diff --git a/arch/sparc64/boot/piggyback.c b/arch/sparc64/boot/piggyback.c index 869b3492c..503b366db 100644 --- a/arch/sparc64/boot/piggyback.c +++ b/arch/sparc64/boot/piggyback.c @@ -1,4 +1,4 @@ -/* $Id: piggyback.c,v 1.1 1997/07/18 06:26:30 ralf Exp $ +/* $Id: piggyback.c,v 1.1 1997/07/11 11:05:26 jj Exp $ Simple utility to make a single-image install kernel with initial ramdisk for Sparc64 tftpbooting without need to set up nfs. diff --git a/arch/sparc64/kernel/sunos_ioctl32.c b/arch/sparc64/kernel/sunos_ioctl32.c index 311110d3c..bb991dee6 100644 --- a/arch/sparc64/kernel/sunos_ioctl32.c +++ b/arch/sparc64/kernel/sunos_ioctl32.c @@ -1,4 +1,4 @@ -/* $Id: sunos_ioctl32.c,v 1.1 1997/07/18 06:26:42 ralf Exp $ +/* $Id: sunos_ioctl32.c,v 1.4 1997/07/17 02:20:43 davem Exp $ * sunos_ioctl32.c: SunOS ioctl compatability on sparc64. * * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx) diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index 3dfdad5a7..dc87c3095 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c @@ -1,4 +1,4 @@ -/* $Id: sys_sunos32.c,v 1.1 1997/07/18 06:26:43 ralf Exp $ +/* $Id: sys_sunos32.c,v 1.3 1997/07/17 02:20:48 davem Exp $ * sys_sunos32.c: SunOS binary compatability layer on sparc64. * * Copyright (C) 1995, 1996, 1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index cefcb6ba3..b5ca851ac 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S @@ -1,4 +1,4 @@ -/* $Id: trampoline.S,v 1.2 1997/08/30 04:53:05 ralf Exp $ +/* $Id: trampoline.S,v 1.2 1997/07/28 02:57:32 davem Exp $ * trampoline.S: Jump start slave processors on sparc64. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc64/lib/VIS.h b/arch/sparc64/lib/VIS.h index 45bc870a4..01232a82b 100644 --- a/arch/sparc64/lib/VIS.h +++ b/arch/sparc64/lib/VIS.h @@ -1,4 +1,4 @@ -/* $Id: VIS.h,v 1.1 1997/07/18 06:26:48 ralf Exp $ +/* $Id: VIS.h,v 1.3 1997/06/27 14:53:18 jj Exp $ * VIS.h: High speed copy/clear operations utilizing the UltraSparc * Visual Instruction Set. * diff --git a/arch/sparc64/mm/modutil.c b/arch/sparc64/mm/modutil.c index a0eba8019..e6b4b2223 100644 --- a/arch/sparc64/mm/modutil.c +++ b/arch/sparc64/mm/modutil.c @@ -1,4 +1,4 @@ -/* $Id: modutil.c,v 1.1 1997/07/18 06:26:54 ralf Exp $ +/* $Id: modutil.c,v 1.1 1997/06/27 14:53:35 jj Exp $ * arch/sparc64/mm/modutil.c * * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index ec96e8871..8a745bf0a 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S @@ -1,4 +1,4 @@ -/* $Id: ultra.S,v 1.3 1997/08/30 04:53:20 ralf Exp $ +/* $Id: ultra.S,v 1.18 1997/08/08 08:34:23 jj Exp $ * ultra.S: Don't expand these all over the place... * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) -- cgit v1.2.3