diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /arch/sparc/mm | |
parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) |
Merge with 2.3.99-pre9.
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/btfixup.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/hypersparc.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/init.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/srmmu.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/sun4c.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/swift.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/tsunami.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/viking.S | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c index 72b8cff3d..3447b839e 100644 --- a/arch/sparc/mm/btfixup.c +++ b/arch/sparc/mm/btfixup.c @@ -1,4 +1,4 @@ -/* $Id: btfixup.c,v 1.9 1999/12/27 06:30:02 anton Exp $ +/* $Id: btfixup.c,v 1.10 2000/05/09 17:40:13 davem Exp $ * btfixup.c: Boot time code fixup and relocator, so that * we can get rid of most indirect calls to achieve single * image sun4c and srmmu kernel. diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index 5c1c0143d..10812273b 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S @@ -1,4 +1,4 @@ -/* $Id: hypersparc.S,v 1.14 1999/08/14 03:51:47 anton Exp $ +/* $Id: hypersparc.S,v 1.15 2000/05/09 17:40:13 davem Exp $ * hypersparc.S: High speed Hypersparc mmu/cache operations. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index 87e30eda1..3f3500046 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.84 2000/03/15 23:26:26 anton Exp $ +/* $Id: init.c,v 1.85 2000/05/09 17:40:13 davem Exp $ * linux/arch/sparc/mm/init.c * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 1fa50e946..0b46e7d25 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -1,4 +1,4 @@ -/* $Id: srmmu.c,v 1.208 2000/02/14 04:52:33 jj Exp $ +/* $Id: srmmu.c,v 1.209 2000/05/09 17:40:13 davem Exp $ * srmmu.c: SRMMU specific routines for memory management. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 9671e7ee7..b4b9a8276 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1,4 +1,4 @@ -/* $Id: sun4c.c,v 1.191 2000/04/08 02:11:41 davem Exp $ +/* $Id: sun4c.c,v 1.192 2000/05/09 17:40:13 davem Exp $ * sun4c.c: Doing in software what should be done in hardware. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index f8e2635bc..2d952f5ad 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S @@ -1,4 +1,4 @@ -/* $Id: swift.S,v 1.4 2000/02/12 03:08:47 zaitcev Exp $ +/* $Id: swift.S,v 1.5 2000/05/09 17:40:13 davem Exp $ * swift.S: MicroSparc-II mmu/cache operations. * * Copyright (C) 1999 David S. Miller (davem@redhat.com) diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 932713eef..1eb8fd6da 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S @@ -1,4 +1,4 @@ -/* $Id: tsunami.S,v 1.3 1999/10/09 05:32:19 zaitcev Exp $ +/* $Id: tsunami.S,v 1.4 2000/05/09 17:40:13 davem Exp $ * tsunami.S: High speed MicroSparc-I mmu/cache operations. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 4e74f34e4..4e0832257 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S @@ -1,4 +1,4 @@ -/* $Id: viking.S,v 1.15 2000/01/15 00:51:36 anton Exp $ +/* $Id: viking.S,v 1.16 2000/05/09 17:40:13 davem Exp $ * viking.S: High speed Viking cache/mmu operations * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |